From 696d91f8bacf11b543119069b46b7fbefa495e39 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 Mar 2008 15:26:46 -0400 Subject: Use upstart to start rhgb. Add conflict for older versions. --- initscripts.spec | 1 + rc.d/rc.sysinit | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index e3496c91..b2f68509 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -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 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 -- cgit v1.2.1 From cb901f33a853a4dcf9e787cce8ee5234a69fa621 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 Mar 2008 15:27:42 -0400 Subject: 8.66-1 --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index b2f68509..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 @@ -217,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 11 2008 Bill Nottingham - 8.66-1 +- use upstart to start rhgb (#433156, ) + * Mon Mar 10 2008 Bill Nottingham - 8.65-1 - Add a serial console udev/upstart handler (#434764, indirectly) - Add some upstart notification for sysv scripts (modified from , #431231) -- cgit v1.2.1 From 1d69f36ebf07832ac275493ae6bfe60d4671c382 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 Mar 2008 17:44:32 -0400 Subject: Revert "Use upstart to start rhgb. Add conflict for older versions." This reverts commit 696d91f8bacf11b543119069b46b7fbefa495e39. --- initscripts.spec | 1 - 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 -- cgit v1.2.1 From b7d22f168539a22034b3dda39aed795c2192d825 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 Mar 2008 17:48:05 -0400 Subject: bump to 8.67-1 --- initscripts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 98661c76..08de49a8 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.66 +Version: 8.67 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -216,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 11 2008 Bill Nottingham - 8.67-1 +- actually, don't + * Tue Mar 11 2008 Bill Nottingham - 8.66-1 - use upstart to start rhgb (#433156, ) -- cgit v1.2.1 From 485377354f5c4119d9b93f585ad228bdf4e0254a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 12 Mar 2008 12:21:14 -0400 Subject: Umount 'ncp' filesystems as well (#437117) --- rc.d/init.d/netfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index aef89709..cfe9264c 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -112,7 +112,7 @@ case "$1" in fi [ -n "$SMBMTAB" ] && action $"Unmounting SMB filesystems: " umount -a -t smbfs [ -n "$CIFSMTAB" ] && action $"Unmounting CIFS filesystems: " umount -a -t cifs - [ -n "$NCPMTAB" ] && action $"Unmounting NCP filesystems: " umount -a -t ncpfs + [ -n "$NCPMTAB" ] && action $"Unmounting NCP filesystems: " umount -a -t ncp,ncpfs rm -f /var/lock/subsys/netfs ;; status) -- cgit v1.2.1