From 0870414986682d408b421a882249fe332e5559ee Mon Sep 17 00:00:00 2001
From: Jonathan Blandford <jrb@redhat.com>
Date: Fri, 17 Oct 2003 21:42:42 +0000
Subject: Fri Oct 17 13:32:26 2003  Jonathan Blandford  <jrb@redhat.com>

        * rc.d/rc.sysinit: turn on rhgb only if 'rhgb' is set in cmdline.
---
 rc.d/rc.sysinit | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'rc.d')

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
+
-- 
cgit v1.2.1