aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>1999-03-22 19:57:13 +0000
committerBill Nottingham <notting@redhat.com>1999-03-22 19:57:13 +0000
commit93f5ee6b559832e04c1edd39fbb5bbf322d3042a (patch)
treeb9323d76a2e83c05e6a33435a4f15628941ec255
parent189711cea22e0d43eabf1cb1ec25b7c12b9237a6 (diff)
downloadinitscripts-93f5ee6b559832e04c1edd39fbb5bbf322d3042a.tar
initscripts-93f5ee6b559832e04c1edd39fbb5bbf322d3042a.tar.gz
initscripts-93f5ee6b559832e04c1edd39fbb5bbf322d3042a.tar.bz2
initscripts-93f5ee6b559832e04c1edd39fbb5bbf322d3042a.tar.xz
initscripts-93f5ee6b559832e04c1edd39fbb5bbf322d3042a.zip
if $BOOTUP is already set, don't source config
-rwxr-xr-xrc.d/init.d/functions9
1 files changed, 5 insertions, 4 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index e62843c2..d6197770 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -17,9 +17,10 @@ export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
[ -z "$COLUMNS" ] && COLUMNS=80
# Read in our configuration
-if [ -f /etc/sysconfig/init ]; then
- . /etc/sysconfig/init
-else
+if [ -z "$BOOTUP" ]; then
+ if [ -f /etc/sysconfig/init ]; then
+ . /etc/sysconfig/init
+ else
# This all seem confusing? Look in /etc/sysconfig/init,
# or in /usr/doc/initscripts-*/sysconfig.txt
BOOTUP=color
@@ -30,9 +31,9 @@ else
SETCOLOR_WARNING="echo -en \\033[1;33m"
SETCOLOR_NORMAL="echo -en \\033[0;39m"
LOGLEVEL=1
+ fi
fi
-
if [ "$BOOTUP" != "verbose" ]; then
INITLOG_ARGS="-q"
else