diff --git a/rc.conf b/rc.conf index 08fb49a..518162a 100644 --- a/rc.conf +++ b/rc.conf @@ -10,7 +10,7 @@ cfg_hostname='changeme' # Services cfg_services+=( 'fsck' 'mount' 'systemd-udevd' 'sysctl' ) # Services that need tp be started in an order -cfg_services+=( '@lo.iface' '@crond' '@dbus' '@alsa' ) # These start in parallel. +cfg_services+=( '@lo.iface' ) # These start in parallel. cfg_services+=( @agetty-tty{2..6} ) # Comment this if your init starts something on the ttys itself. cfg_services+=( 'rc.local' ) # Traditionally, rc.local starts last. Technically here it doesn't. Not quite :) diff --git a/rc.in b/rc.in index 1971ce9..09f3f25 100755 --- a/rc.in +++ b/rc.in @@ -20,7 +20,7 @@ rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; } rc.motd() { [[ -f "/etc/rc.motd" ]] && { while read; do - printf "$REPLY" + printf "%s\n" "$REPLY" done < "/etc/rc.motd" } @@ -33,14 +33,14 @@ rc.tmpdirs() { rc.mount_misc() { for m in "${cfg_mounts[@]}"; do - IFS=':' read fs fs_type mountpoint mount_options <<< "$m" + echo "$m" | while IFS=':' read fs fs_type mountpoint mount_options; do + [[ "$mount_options" ]] || { mount_options='defaults'; } - [[ "$mount_options" ]] || { mount_options='defaults'; } - - mountpoint -q "$mountpoint" || { - [[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; } - mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint" - } + mountpoint -q "$mountpoint" || { + [[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; } + mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint" + } + done done } @@ -144,6 +144,7 @@ rc.shutdown() { } rc.hostname() { + [[ -f '/etc/hostname' ]] && { hostname "$(