aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/rc.sysinit10
1 files changed, 8 insertions, 2 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index e8e14c3f..531e1ba0 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -79,7 +79,7 @@ fi
RHGB_STARTED=0
mount -n -t devpts /dev/pts /dev/pts
-if ! fgrep -q nogui /proc/cmdline && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
+if fgrep rhgb /proc/cmdline > /dev/null 2>&1 && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
/usr/bin/rhgb
RHGB_STARTED=1
fi
@@ -564,7 +564,7 @@ fi
action $"Mounting local filesystems: " mount -a -t nonfs,smbfs,ncpfs -O no_netdev
# Start the graphical boot, if necessary and not done yet.
-if ! fgrep -q nogui /proc/cmdline && [ "$RHGB_STARTED" -eq 0 -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
+if fgrep rhgb /proc/cmdline > /dev/null 2>&1 && [ "$RHGB_STARTED" -eq 0 -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
/usr/bin/rhgb
RHGB_STARTED=1
fi
@@ -837,3 +837,9 @@ if [ "$PROMPT" != "no" ]; then
/sbin/getkey i && touch /var/run/confirm
fi
wait
+
+# 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
+fi
+