diff options
| -rwxr-xr-x | prefdm | 5 | ||||
| -rwxr-xr-x | rc.d/init.d/functions | 20 | ||||
| -rwxr-xr-x | rc.d/init.d/netfs | 4 | ||||
| -rwxr-xr-x | rc.d/rc | 10 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 43 |
5 files changed, 1 insertions, 81 deletions
@@ -2,11 +2,6 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin -# shut down any graphical boot that might exist -if [ -x /usr/bin/rhgb-client ]; then - /usr/bin/rhgb-client --quit -fi - # We need to source this so that the login screens get translated [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index bb943963..57340fb6 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -459,11 +459,6 @@ echo_warning() { # Inform the graphical boot of our current state update_boot_stage() { - if [ "$GRAPHICAL" = "yes" ]; then - if [ -x /usr/bin/rhgb-client ]; then - /usr/bin/rhgb-client --update="$1" - fi - fi return 0 } @@ -483,7 +478,6 @@ failure() { # initlog $INITLOG_ARGS -n $0 -s "$1" -e 2 #fi [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_failure - [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes return $rc } @@ -513,22 +507,10 @@ action() { STRING=$1 echo -n "$STRING " - if [ "${RHGB_STARTED:-}" != "" -a -w /etc/rhgb/temp/rhgb-console ]; then - echo -n "$STRING " > /etc/rhgb/temp/rhgb-console - fi shift "$@" && success $"$STRING" || failure $"$STRING" rc=$? echo - if [ "${RHGB_STARTED:-}" != "" -a -w /etc/rhgb/temp/rhgb-console ]; then - if [ "$rc" = "0" ]; then - echo_success > /etc/rhgb/temp/rhgb-console - else - echo_failure > /etc/rhgb/temp/rhgb-console - [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes - fi - echo > /etc/rhgb/temp/rhgb-console - fi return $rc } @@ -540,7 +522,6 @@ strstr() { # Confirm whether we really want to run this service confirm() { - [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes while : ; do echo -n $"Start service $1 (Y)es/(N)o/(C)ontinue? [Y] " read answer @@ -548,7 +529,6 @@ confirm() { return 0 elif strstr $"cC" "$answer" ; then rm -f /var/run/confirm - [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=no return 2 elif strstr $"nN" "$answer" ; then return 1 diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 1ad100bb..211874d6 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -70,10 +70,6 @@ case "$1" in fi if [ "$rc" -gt 1 ]; then - if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then - /usr/bin/rhgb-client --details=yes >/dev/null 2>&1 - fi - failure "$STRING" echo echo @@ -29,10 +29,6 @@ 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" @@ -97,7 +93,6 @@ 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 @@ -108,8 +103,3 @@ 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 diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 5c0328ea..3f97da5e 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -54,9 +54,6 @@ disable_selinux() { } relabel_selinux() { - if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then - /usr/bin/rhgb-client --quit - fi # if /sbin/init is not labeled correctly this process is running in the # wrong context, so a reboot will be required after relabel REBOOTFLAG=`restorecon -v /sbin/init` @@ -189,10 +186,6 @@ init_crypto() { ret=1 continue fi - if [ -z "$key" -a -x /usr/bin/rhgb-client ] \ - && /usr/bin/rhgb-client --ping ; then - /usr/bin/rhgb-client --quit - fi if [ -z "$makeswap" ] && cryptsetup isLuks "$src" 2>/dev/null ; then if key_is_random "$key"; then echo $"$dst: LUKS requires non-random key, skipping" @@ -301,21 +294,13 @@ 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 # Set the hostname. -update_boot_stage RChostname action $"Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME} # Device mapper & related initialization @@ -557,11 +542,7 @@ if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then STRING=$"Checking filesystems" echo $STRING - if [ -n "${RHGB_STARTED}" -a -w /etc/rhgb/temp/rhgb-console ]; then - fsck -T -t noopts=_netdev -A $fsckoptions > /etc/rhgb/temp/rhgb-console - else - fsck -T -t noopts=_netdev -A $fsckoptions - fi + fsck -T -t noopts=_netdev -A $fsckoptions rc=$? if [ "$rc" -eq "0" ]; then @@ -580,10 +561,6 @@ if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then # A return of 4 or higher means there were serious problems. if [ $rc -gt 1 ]; then - if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then - /usr/bin/rhgb-client --quit - fi - failure "$STRING" echo echo @@ -623,7 +600,6 @@ remount_needed() { } # Remount the root filesystem read-write. -update_boot_stage RCmountfs if remount_needed ; then action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw / fi @@ -678,13 +654,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 @@ -708,10 +677,6 @@ fi # Configure machine if necessary. if [ -f /.unconfigured ]; then - if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then - /usr/bin/rhgb-client --quit - fi - if [ -x /usr/bin/system-config-keyboard ]; then /usr/bin/system-config-keyboard fi @@ -786,7 +751,6 @@ chown root:root /tmp/.ICE-unix [ -n "$SELINUX_STATE" ] && restorecon /tmp/.ICE-unix >/dev/null 2>&1 # Start up swapping. -update_boot_stage RCswap action $"Enabling /etc/fstab swaps: " swapon -a -e if [ "$AUTOSWAP" = "yes" ]; then curswap=$(awk '/^\/dev/ { print $1 }' /proc/swaps | while read x; do get_numeric_dev dec $x ; echo -n " "; done) @@ -841,8 +805,3 @@ fi wait [ "$PROMPT" != no ] && rm -f /var/run/getkey_done -# Let rhgb know that we're leaving rc.sysinit -if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then - /usr/bin/rhgb-client --sysinit -fi - |