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/rc.sysinit')

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