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. --- 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 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