aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/rc
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-06-19 11:18:26 -0400
committerBill Nottingham <notting@redhat.com>2008-06-19 11:18:26 -0400
commit618b209de75be1f80406aa7df787292249343fd3 (patch)
tree9394cac447091e70ef5a153c4f88d0715f547760 /rc.d/rc
parent5a34a28455350aedcbf47d255baf80fde39c79b5 (diff)
downloadinitscripts-618b209de75be1f80406aa7df787292249343fd3.tar
initscripts-618b209de75be1f80406aa7df787292249343fd3.tar.gz
initscripts-618b209de75be1f80406aa7df787292249343fd3.tar.bz2
initscripts-618b209de75be1f80406aa7df787292249343fd3.tar.xz
initscripts-618b209de75be1f80406aa7df787292249343fd3.zip
Don't export GRAPHICAL - plymouth is for all modes.
Don't try to start rhgb.
Diffstat (limited to 'rc.d/rc')
-rwxr-xr-xrc.d/rc11
1 files changed, 2 insertions, 9 deletions
diff --git a/rc.d/rc b/rc.d/rc
index 0d1abd12..a75536a8 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -28,11 +28,6 @@ export runlevel previous
. /etc/init.d/functions
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"
@@ -108,8 +103,6 @@ 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
+if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
+ /usr/bin/rhgb-client --quit
fi