diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-09-25 13:25:34 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-09-25 13:25:34 -0400 |
| commit | 832f088f41ef7433cd7f63c47d3352aa25981474 (patch) | |
| tree | 1cd7a1dccef82d2015b6785e05d22b9909e57a18 | |
| parent | dd823721d990840a23df8187831e7a7f98cb9c7f (diff) | |
| download | initscripts-832f088f41ef7433cd7f63c47d3352aa25981474.tar initscripts-832f088f41ef7433cd7f63c47d3352aa25981474.tar.gz initscripts-832f088f41ef7433cd7f63c47d3352aa25981474.tar.bz2 initscripts-832f088f41ef7433cd7f63c47d3352aa25981474.tar.xz initscripts-832f088f41ef7433cd7f63c47d3352aa25981474.zip | |
Check more correctly whether rhgb actually starts. (#462763)
| -rwxr-xr-x | rc.d/rc.sysinit | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 27c667d0..e2626c19 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -307,7 +307,9 @@ mount -n /dev/pts >/dev/null 2>&1 if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then ( . /etc/sysconfig/i18n 2>/dev/null ; /usr/bin/rhgb ) - RHGB_STARTED=1 + if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then + RHGB_STARTED=1 + fi fi # Configure kernel parameters @@ -682,7 +684,9 @@ fi # Start the graphical boot, if necessary and not done yet. if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ -z "$RHGB_STARTED" -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then ( . /etc/sysconfig/i18n 2>/dev/null ; /usr/bin/rhgb ) - RHGB_STARTED=1 + if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then + RHGB_STARTED=1 + fi fi # Initialize pseudo-random number generator |