aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-02-06 20:40:15 +0000
committerBill Nottingham <notting@redhat.com>2004-02-06 20:40:15 +0000
commite82f6cac308be4aa2334f3d05bdff1e63a6d9a30 (patch)
treecd6f29bb6fe141ae97d4c6d4b978757abf6ac5d1
parent804f51110e5b7e11bc319a1774e9251285461cea (diff)
downloadinitscripts-e82f6cac308be4aa2334f3d05bdff1e63a6d9a30.tar
initscripts-e82f6cac308be4aa2334f3d05bdff1e63a6d9a30.tar.gz
initscripts-e82f6cac308be4aa2334f3d05bdff1e63a6d9a30.tar.bz2
initscripts-e82f6cac308be4aa2334f3d05bdff1e63a6d9a30.tar.xz
initscripts-e82f6cac308be4aa2334f3d05bdff1e63a6d9a30.zip
fix mismerge
-rwxr-xr-xrc.d/rc.sysinit1
1 files changed, 1 insertions, 0 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 7d5087d6..4017ae5a 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -842,6 +842,7 @@ if [ -x /sbin/redhat-support-check -a -f /var/lib/supportinfo ]; then
echo $"Normal startup will continue in 10 seconds."
sleep 10
}
+fi
# Let rhgb know that we're leaving rc.sysinit
if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
/usr/bin/rhgb-client --sysinit