aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-09-17 20:13:24 +0000
committerBill Nottingham <notting@redhat.com>2004-09-17 20:13:24 +0000
commit1a3c9d8ce57e6c1d5fe1414c08229f018a62853e (patch)
tree4a64640cdfc4eb06d1aecf83a561b37a2a5f7d66 /rc.d
parent65143625bef57ebde17152028265779011c6ed06 (diff)
downloadinitscripts-1a3c9d8ce57e6c1d5fe1414c08229f018a62853e.tar
initscripts-1a3c9d8ce57e6c1d5fe1414c08229f018a62853e.tar.gz
initscripts-1a3c9d8ce57e6c1d5fe1414c08229f018a62853e.tar.bz2
initscripts-1a3c9d8ce57e6c1d5fe1414c08229f018a62853e.tar.xz
initscripts-1a3c9d8ce57e6c1d5fe1414c08229f018a62853e.zip
rhgb enhancements (<veillard@redhat.com>, #132665)
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/init.d/functions12
-rwxr-xr-xrc.d/rc.sysinit12
2 files changed, 22 insertions, 2 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 0d3d755c..be61b5f6 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -424,10 +424,22 @@ warning() {
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
initlog $INITLOG_ARGS -c "$*" && 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_failed > /etc/rhgb/tmp/rhgb-console
+ [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes
+ fi
+ echo
+ fi
return $rc
}
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index db6b3d10..7db1a880 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -383,7 +383,11 @@ if [ -z "$fastboot" -a "$READONLY" != "yes" -a "X$ROOTFSTYPE" != "Xnfs" -a "X$RO
else
rootdev=/
fi
- initlog -c "fsck -T -a $rootdev $fsckoptions"
+ if [ "${RHGB_STARTED}" != "" -a -w /etc/rhgb/temp/rhgb-console ]; then
+ fsck -T -a $rootdev $fsckoptions > /etc/rhgb/temp/rhgb-console
+ else
+ initlog -c "fsck -T -a $rootdev $fsckoptions"
+ fi
rc=$?
if [ "$rc" -eq "0" ]; then
@@ -639,7 +643,11 @@ _RUN_QUOTACHECK=0
if [ -z "$fastboot" ]; then
STRING=$"Checking filesystems"
echo $STRING
- initlog -c "fsck -T -R -A -a $fsckoptions"
+ if [ "${RHGB_STARTED}" != "" -a -w /etc/rhgb/temp/rhgb-console ]; then
+ fsck -T -R -A -a $fsckoptions > /etc/rhgb/temp/rhgb-console
+ else
+ initlog -c "fsck -T -R -A -a $fsckoptions"
+ fi
rc=$?
if [ "$rc" -eq "0" ]; then
success "$STRING"