From e058c63a0afdbf7e77839d3394781018100cf573 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 22 Oct 2003 19:56:28 +0000
Subject: switch on rhgb details for confirm mode. (#100894) catch a couple
 more failure cases in rc.sysinit for jumping out of rhgb.

---
 rc.d/init.d/functions | 2 ++
 rc.d/rc.sysinit       | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'rc.d')

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 0badd298..36e7f803 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -438,6 +438,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
@@ -445,6 +446,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/rc.sysinit b/rc.d/rc.sysinit
index 6fb71549..17548c74 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -219,6 +219,9 @@ fi
 if [ -f /forcefsck ] || strstr "$cmdline" forcefsck ; then
 	fsckoptions="-f $fsckoptions"
 elif [ -f /.autofsck ]; then
+        if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
+	     chvt 1
+	fi
 	echo $"Your system appears to have shut down uncleanly"
 	AUTOFSCK_TIMEOUT=5
 	[ -f /etc/sysconfig/autofsck ] && . /etc/sysconfig/autofsck
@@ -489,6 +492,9 @@ if [ -f /etc/raidtab ]; then
 
 	# A non-zero return means there were problems.
 	if [ $rc -gt 0 ]; then
+	        if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
+		    chvt 1
+		fi
 		echo
 		echo
 		echo $"*** An error occurred during the RAID startup"
-- 
cgit v1.2.1