diff options
| author | Bill Nottingham <notting@redhat.com> | 1999-02-04 20:17:57 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 1999-02-04 20:17:57 +0000 |
| commit | 14ac181bc961bd8691fe4db9225f8e13f672ff74 (patch) | |
| tree | a83ff0f95d6defee733ac5cdfdff372f297f543a /rc.d | |
| parent | 259187b07b6e775ce79671f910cab860682e3912 (diff) | |
| download | initscripts-14ac181bc961bd8691fe4db9225f8e13f672ff74.tar initscripts-14ac181bc961bd8691fe4db9225f8e13f672ff74.tar.gz initscripts-14ac181bc961bd8691fe4db9225f8e13f672ff74.tar.bz2 initscripts-14ac181bc961bd8691fe4db9225f8e13f672ff74.tar.xz initscripts-14ac181bc961bd8691fe4db9225f8e13f672ff74.zip | |
bugfixes for 'old' mode
Diffstat (limited to 'rc.d')
| -rwxr-xr-x | rc.d/init.d/functions | 13 | ||||
| -rwxr-xr-x | rc.d/init.d/halt | 2 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 882748f7..95f970fd 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -212,7 +212,8 @@ action() { if [ -z "$IN_INITLOG" ]; then initlog $INITLOG_ARGS -c "$*" && success "$STRING" || failure "$STRING" rc=$? - [ "$BOOTUP" = "color" ] && echo +# [ "$BOOTUP" = "color" ] && echo + echo return $rc else # This sucks. @@ -225,10 +226,16 @@ action() { fi if [ $rc ]; then - [ "$BOOTUP" = "color" ] || { echo ; echo $output ; } + [ "$BOOTUP" != "color" ] && { + if [ -n "$output" ]; then + echo + echo $output + else + echo + fi + } success "$STRING" else - echo echo $output failure "$STRING" fi diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index 08cf9b67..198767c0 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -14,7 +14,7 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin . /etc/rc.d/init.d/functions runcmd() { - echo -n $1 + echo -n "$1 " shift if [ "$BOOTUP" = "color" ]; then $* && echo_success || echo_failure diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 4a3bb6cb..a489d194 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -26,7 +26,7 @@ fi . /etc/rc.d/init.d/functions # Fix console loglevel -/sbin/loglevel 1 +/sbin/loglevel $LOGLEVEL # Start up swapping. action "Activating swap partitions" swapon -a @@ -157,8 +157,6 @@ if [ -n "$USEMODULES" ]; then fi fi -if [ -n "$USEMODULES" ]; then - if [ -f /proc/sys/kernel/modprobe ]; then # /proc/sys/kernel/modprobe indicates built-in kmod instead if [ -n "$USEMODULES" ]; then @@ -308,7 +306,7 @@ $CLOCK $CLOCKFLAGS action "Setting clock $CLOCKDEF: `date`" date # Right, now turn on swap in case we swap to files. -swapon -a 2>&1 >/dev/null +swapon -a >/dev/null 2>&1 action "Enabling swap space" /bin/true # Initialize the serial ports. |