aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/init.d
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/init.d
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/init.d')
-rwxr-xr-xrc.d/init.d/functions20
-rwxr-xr-xrc.d/init.d/netfs4
2 files changed, 24 insertions, 0 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index d54861da..fed1fafa 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -459,6 +459,11 @@ 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
}
@@ -478,6 +483,7 @@ 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
}
@@ -507,10 +513,22 @@ 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
}
@@ -522,6 +540,7 @@ 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
@@ -529,6 +548,7 @@ 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 211874d6..1ad100bb 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -70,6 +70,10 @@ 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