From 696d91f8bacf11b543119069b46b7fbefa495e39 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 11 Mar 2008 15:26:46 -0400
Subject: Use upstart to start rhgb. Add conflict for older versions.

---
 rc.d/rc.sysinit | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'rc.d')

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 


From 1d69f36ebf07832ac275493ae6bfe60d4671c382 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
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.
---
 rc.d/rc.sysinit | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'rc.d')

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 


From 485377354f5c4119d9b93f585ad228bdf4e0254a Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
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(-)

(limited to 'rc.d')

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