aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/init.d/functions47
-rwxr-xr-xrc.d/rc.sysinit8
2 files changed, 16 insertions, 39 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 907fee10..6180722a 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -145,9 +145,9 @@ daemon() {
# And start it up.
if [ -z "$user" ]; then
- $nice initlog $INITLOG_ARGS -c "$*"
+ $nice $*
else
- $nice initlog $INITLOG_ARGS -c "runuser -s /bin/bash - $user -c \"$*\""
+ $nice runuser -s /bin/bash - $user -c \"$*\"
fi
[ "$?" -eq 0 ] && success $"$base startup" || failure $"$base startup"
}
@@ -365,14 +365,9 @@ update_boot_stage() {
# Log that something succeeded
success() {
- if [ -z "${IN_INITLOG:-}" ]; then
- initlog $INITLOG_ARGS -n $0 -s "$1" -e 1
- else
- # silly hack to avoid EPIPE killing rc.sysinit
- trap "" SIGPIPE
- echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21
- trap - SIGPIPE
- fi
+ #if [ -z "${IN_INITLOG:-}" ]; then
+ # initlog $INITLOG_ARGS -n $0 -s "$1" -e 1
+ #fi
[ "$BOOTUP" != "verbose" -a -z "$LSB" ] && echo_success
return 0
}
@@ -380,13 +375,9 @@ success() {
# Log that something failed
failure() {
rc=$?
- if [ -z "${IN_INITLOG:-}" ]; then
- initlog $INITLOG_ARGS -n $0 -s "$1" -e 2
- else
- trap "" SIGPIPE
- echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 2" >&21
- trap - SIGPIPE
- fi
+ #if [ -z "${IN_INITLOG:-}" ]; then
+ # initlog $INITLOG_ARGS -n $0 -s "$1" -e 2
+ #fi
[ "$BOOTUP" != "verbose" -a -z "$LSB" ] && echo_failure
[ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes
return $rc
@@ -395,13 +386,9 @@ failure() {
# Log that something passed, but may have had errors. Useful for fsck
passed() {
rc=$?
- if [ -z "${IN_INITLOG:-}" ]; then
- initlog $INITLOG_ARGS -n $0 -s "$1" -e 1
- else
- trap "" SIGPIPE
- echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21
- trap - SIGPIPE
- fi
+ #if [ -z "${IN_INITLOG:-}" ]; then
+ # initlog $INITLOG_ARGS -n $0 -s "$1" -e 1
+ #fi
[ "$BOOTUP" != "verbose" -a -z "$LSB" ] && echo_passed
return $rc
}
@@ -409,13 +396,9 @@ passed() {
# Log a warning
warning() {
rc=$?
- if [ -z "${IN_INITLOG:-}" ]; then
- initlog $INITLOG_ARGS -n $0 -s "$1" -e 1
- else
- trap "" SIGPIPE
- echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21
- trap - SIGPIPE
- fi
+ #if [ -z "${IN_INITLOG:-}" ]; then
+ # initlog $INITLOG_ARGS -n $0 -s "$1" -e 1
+ #fi
[ "$BOOTUP" != "verbose" -a -z "$LSB" ] && echo_warning
return $rc
}
@@ -428,7 +411,7 @@ action() {
echo -n "$STRING " > /etc/rhgb/temp/rhgb-console
fi
shift
- initlog $INITLOG_ARGS -c "$*" && success $"$STRING" || failure $"$STRING"
+ $* && success $"$STRING" || failure $"$STRING"
rc=$?
echo
if [ "${RHGB_STARTED}" != "" -a -w /etc/rhgb/temp/rhgb-console ]; then
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 76339bc1..e76b4996 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -5,11 +5,6 @@
# Taken in part from Miquel van Smoorenburg's bcheckrc.
#
-# Rerun ourselves through initlog
-if [ -z "$IN_INITLOG" -a -x /sbin/initlog ]; then
- exec /sbin/initlog -r /etc/rc.d/rc.sysinit
-fi
-
HOSTNAME=`/bin/hostname`
HOSTTYPE=`uname -m`
unamer=`uname -r`
@@ -283,7 +278,6 @@ if [ "$CONSOLETYPE" = "vt" -a -x /bin/loadkeys ]; then
fi
fi
if [ -n "$KEYMAP" ]; then
- # Since this takes in/output from stdin/out, we can't use initlog
if [ -n "$KEYTABLE" ]; then
echo -n $"Loading default keymap ($KEYTABLE): "
else
@@ -372,7 +366,7 @@ if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then
if [ "${RHGB_STARTED}" != "0" -a -w /etc/rhgb/temp/rhgb-console ]; then
fsck -T -A -a $fsckoptions > /etc/rhgb/temp/rhgb-console
else
- initlog -c "fsck -T -A -a $fsckoptions"
+ fsck -T -A -a $fsckoptions
fi
rc=$?