diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-03-11 17:44:32 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-03-11 17:44:32 -0400 |
| commit | 1d69f36ebf07832ac275493ae6bfe60d4671c382 (patch) | |
| tree | 2089adabea2ca67a005aef545220b77118dbe6eb | |
| parent | 4b15ba090579fc54a9edcca120e8755747101064 (diff) | |
| download | initscripts-1d69f36ebf07832ac275493ae6bfe60d4671c382.tar.gz initscripts-1d69f36ebf07832ac275493ae6bfe60d4671c382.tar.xz initscripts-1d69f36ebf07832ac275493ae6bfe60d4671c382.zip | |
Revert "Use upstart to start rhgb. Add conflict for older versions."
This reverts commit 696d91f8bacf11b543119069b46b7fbefa495e39.
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/initscripts.spec b/initscripts.spec index 9f3a5279..98661c76 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -28,7 +28,6 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.14-0.5.rc2.fc7 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 -Conflicts: rhgb < 0.17.7-7 Obsoletes: rhsound sapinit Obsoletes: hotplug Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, coreutils diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index abb2ae6a..0f0a238b 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -305,8 +305,8 @@ RHGB_STARTED= mount -n /dev/pts >/dev/null 2>&1 [ -n "$SELINUX_STATE" ] && restorecon /dev/pts >/dev/null 2>&1 -if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" ]; then - /sbin/start rhgb +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 fi @@ -674,8 +674,8 @@ 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" ]; then - /sbin/start rhgb +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 fi |