aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/rc
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-06-19 11:14:17 -0400
committerBill Nottingham <notting@redhat.com>2008-06-19 11:14:17 -0400
commit5a34a28455350aedcbf47d255baf80fde39c79b5 (patch)
treea31a354b1d98b4d1f42ef0f65575873a763ce2b0 /rc.d/rc
parent2b28cd1ba79cfaf0d9dca0c060a0f5be7a0b72b9 (diff)
downloadinitscripts-5a34a28455350aedcbf47d255baf80fde39c79b5.tar
initscripts-5a34a28455350aedcbf47d255baf80fde39c79b5.tar.gz
initscripts-5a34a28455350aedcbf47d255baf80fde39c79b5.tar.bz2
initscripts-5a34a28455350aedcbf47d255baf80fde39c79b5.tar.xz
initscripts-5a34a28455350aedcbf47d255baf80fde39c79b5.zip
Revert "Remove rhgb support."
Diffstat (limited to 'rc.d/rc')
-rwxr-xr-xrc.d/rc10
1 files changed, 10 insertions, 0 deletions
diff --git a/rc.d/rc b/rc.d/rc
index 2766aa68..0d1abd12 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -29,6 +29,10 @@ export runlevel previous
export CONSOLETYPE
cmdline=$(cat /proc/cmdline)
+if ! strstr "$cmdline" rhgb; then
+ GRAPHICAL="no"
+ export GRAPHICAL
+fi
do_confirm="no"
if [ -f /var/run/confirm ]; then
do_confirm="yes"
@@ -93,6 +97,7 @@ for i in /etc/rc$runlevel.d/S* ; do
set +x
fi
+ update_boot_stage "$subsys"
# Bring the subsystem up.
[ -n "$UPSTART" ] && initctl emit --quiet "starting $subsys"
if [ "$subsys" = "halt" -o "$subsys" = "reboot" ]; then
@@ -103,3 +108,8 @@ for i in /etc/rc$runlevel.d/S* ; do
[ -n "$UPSTART" ] && initctl emit --quiet "started $subsys"
done
[ "$do_confirm" = "yes" ] && rm -f /var/run/confirm
+if [ "$GRAPHICAL" = "yes" ]; then
+ if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
+ /usr/bin/rhgb-client --quit
+ fi
+fi