diff options
| author | Jonathan Blandford <jrb@redhat.com> | 2003-10-17 21:42:42 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@redhat.com> | 2003-10-17 21:42:42 +0000 |
| commit | 0870414986682d408b421a882249fe332e5559ee (patch) | |
| tree | 2fce2cc6bb113a6253ed6ea587ee2bee9d8b295b | |
| parent | 42e7925e95dfc8605e644cd77b92fad5aa549d43 (diff) | |
| download | initscripts-0870414986682d408b421a882249fe332e5559ee.tar initscripts-0870414986682d408b421a882249fe332e5559ee.tar.gz initscripts-0870414986682d408b421a882249fe332e5559ee.tar.bz2 initscripts-0870414986682d408b421a882249fe332e5559ee.tar.xz initscripts-0870414986682d408b421a882249fe332e5559ee.zip | |
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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 10 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,7 @@ +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. + 2003-10-10 Bill Nottingham <notting@redhat.com> * ChangeLog, initscripts.spec: 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 + |