diff options
| author | Bill Nottingham <notting@redhat.com> | 1999-06-17 16:22:25 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 1999-06-17 16:22:25 +0000 |
| commit | 19eaf7b3c62da6e6f6af5ce481ddf661bd906e00 (patch) | |
| tree | 535060c7b3ebab8406e35a9d41cb11f8598b7ef7 | |
| parent | 2b0c2e16b8a030d90b41fc91a587206ba68dbe8a (diff) | |
| download | initscripts-19eaf7b3c62da6e6f6af5ce481ddf661bd906e00.tar initscripts-19eaf7b3c62da6e6f6af5ce481ddf661bd906e00.tar.gz initscripts-19eaf7b3c62da6e6f6af5ce481ddf661bd906e00.tar.bz2 initscripts-19eaf7b3c62da6e6f6af5ce481ddf661bd906e00.tar.xz initscripts-19eaf7b3c62da6e6f6af5ce481ddf661bd906e00.zip | |
use INITLOG_ARGS everywhere except fsck, fix typo
| -rwxr-xr-x | rc.d/init.d/functions | 12 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 2426a722..d7702197 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -240,9 +240,9 @@ echo_passed() { # Log that something succeeded success() { if [ -z "$IN_INITLOG" ]; then - initlog -n $0 -s "$1" -e 1 + initlog $INITLOG_ARGS -n $0 -s "$1" -e 1 else - echo "-n $0 -s \"$1\" -e 1" >&21 + echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21 fi [ "$BOOTUP" != "verbose" ] && echo_success return 0 @@ -252,9 +252,9 @@ success() { failure() { rc=$? if [ -z "$IN_INITLOG" ]; then - initlog -n $0 -s "$1" -e 2 + initlog $INITLOG_ARGS -n $0 -s "$1" -e 2 else - echo "-n $0 -s \"$1\" -e 2" >&21 + echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 2" >&21 fi [ "$BOOTUP" != "verbose" ] && echo_failure return $rc @@ -264,9 +264,9 @@ failure() { passed() { rc=$? if [ -z "$IN_INITLOG" ]; then - initlog -n $0 -s "$1" -e 1 + initlog $INITLOG_ARGS -n $0 -s "$1" -e 1 else - echo "-n $0 -s \"$1\" -e 1" >&21 + echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21 fi [ "$BOOTUP" != "verbose" ] && echo_passed return $rc diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 86539176..d8697483 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -7,7 +7,7 @@ # Rerun ourselves through initlog if [ -z "$IN_INITLOG" ]; then - [ -f /sbin/initlog ] && exec /sbin/initlog -r /etc/rc.d/rc.sysinit + [ -f /sbin/initlog ] && exec /sbin/initlog $INITLOG_ARGS -r /etc/rc.d/rc.sysinit fi # Set the path @@ -100,7 +100,7 @@ if [ -n "$KEYMAP" ]; then fi # Load system font -if [ -x /sbin/setsysfont ] +if [ -x /sbin/setsysfont ]; then . /etc/sysconfig/i18n if [ -f /etc/sysconfig/console/$SYSFONT.psf.gz -o -f /usr/lib/kbd/consolefonts/$SYSFONT.psf.gz ]; then action "Setting default font" /sbin/setsysfont |