diff options
| -rw-r--r-- | initscripts.spec | 6 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/initscripts.spec b/initscripts.spec index e3496c91..9f3a5279 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.65 +Version: 8.66 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -28,6 +28,7 @@ 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 @@ -216,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 11 2008 Bill Nottingham <notting@redhat.com> - 8.66-1 +- use upstart to start rhgb (#433156, <cdahlin@ncsu.edu>) + * Mon Mar 10 2008 Bill Nottingham <notting@redhat.com> - 8.65-1 - Add a serial console udev/upstart handler (#434764, indirectly) - Add some upstart notification for sysv scripts (modified from <cjdahlin@ncsu.edu>, #431231) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 0f0a238b..abb2ae6a 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" -a -x /usr/bin/rhgb ]; then - ( . /etc/sysconfig/i18n 2>/dev/null ; /usr/bin/rhgb ) +if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" ]; then + /sbin/start 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" -a -x /usr/bin/rhgb ]; then - ( . /etc/sysconfig/i18n 2>/dev/null ; /usr/bin/rhgb ) +if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ -z "$RHGB_STARTED" -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" ]; then + /sbin/start rhgb RHGB_STARTED=1 fi |