diff options
author | Bill Nottingham <notting@redhat.com> | 2008-05-13 12:22:55 -0400 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2008-05-13 12:22:55 -0400 |
commit | c722b0ee95746aa9289efd40bbdd23a87d1e5dee (patch) | |
tree | 41f58a4cb626f15731bf401ac1ae956337bd5c49 /rc.d/init.d | |
parent | 73a91036b96450f976c5e45d3478d4b6f905c79a (diff) | |
download | initscripts-c722b0ee95746aa9289efd40bbdd23a87d1e5dee.tar initscripts-c722b0ee95746aa9289efd40bbdd23a87d1e5dee.tar.gz initscripts-c722b0ee95746aa9289efd40bbdd23a87d1e5dee.tar.bz2 initscripts-c722b0ee95746aa9289efd40bbdd23a87d1e5dee.tar.xz initscripts-c722b0ee95746aa9289efd40bbdd23a87d1e5dee.zip |
Remove rhgb support.
Diffstat (limited to 'rc.d/init.d')
-rwxr-xr-x | rc.d/init.d/functions | 20 | ||||
-rwxr-xr-x | rc.d/init.d/netfs | 4 |
2 files changed, 0 insertions, 24 deletions
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 |