diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-06-19 11:18:26 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-06-19 11:18:26 -0400 |
| commit | 618b209de75be1f80406aa7df787292249343fd3 (patch) | |
| tree | 9394cac447091e70ef5a153c4f88d0715f547760 | |
| parent | 5a34a28455350aedcbf47d255baf80fde39c79b5 (diff) | |
| download | initscripts-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.
| -rwxr-xr-x | rc.d/init.d/functions | 4 | ||||
| -rwxr-xr-x | rc.d/rc | 11 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 18 | ||||
| -rw-r--r-- | sysconfig/init | 2 |
4 files changed, 3 insertions, 32 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index fed1fafa..09f47f37 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -459,10 +459,8 @@ echo_warning() { # Inform the graphical boot of our current state update_boot_stage() { - if [ "$GRAPHICAL" = "yes" ]; then - if [ -x /usr/bin/rhgb-client ]; then + if [ -x /usr/bin/rhgb-client ]; then /usr/bin/rhgb-client --update="$1" - fi fi return 0 } @@ -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 diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 2a0f61bc..7dcf5c39 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -301,17 +301,6 @@ if [ -f /etc/rc.modules ]; then /etc/rc.modules fi -# Start the graphical boot, if necessary; /usr may not be mounted yet, so we -# may have to do this again after mounting -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 ) - RHGB_STARTED=1 -fi - # Configure kernel parameters update_boot_stage RCkernelparam sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 @@ -674,13 +663,6 @@ else fi 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 ) - RHGB_STARTED=1 -fi - # Initialize pseudo-random number generator if [ -f "/var/lib/random-seed" ]; then cat /var/lib/random-seed > /dev/urandom diff --git a/sysconfig/init b/sysconfig/init index 117b6bc6..5ccec5e6 100644 --- a/sysconfig/init +++ b/sysconfig/init @@ -2,8 +2,6 @@ # verbose => old-style bootup # anything else => new style bootup without ANSI colors or positioning BOOTUP=color -# Turn on graphical boot -GRAPHICAL=yes # column to start "[ OK ]" label in RES_COL=60 # terminal sequence to move to that column. You could change this |