From 12a4be6288adef4d39fd16f5472dbd733230ad41 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 2 Nov 2004 05:17:28 +0000
Subject: remove delay on unclean startup - rely on autofsck/forcefsck

---
 rc.d/rc.sysinit | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'rc.d/rc.sysinit')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index fe72fd27..0c581f05 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -320,35 +320,10 @@ 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
 	if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
 		AUTOFSCK_OPT=-f
 	fi
-
-	if [ "$PROMPT" != "no" ]; then
-		if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
-			if /sbin/getkey -c $AUTOFSCK_TIMEOUT -m $"Press N within %d seconds to not force file system integrity check..." n ; then
-				AUTOFSCK_OPT=
-			fi
-		else
-			if /sbin/getkey -c $AUTOFSCK_TIMEOUT -m $"Press Y within %d seconds to force file system integrity check..." y ; then
-				AUTOFSCK_OPT=-f
-			fi
-		fi
-		echo
-	else
-		# PROMPT not allowed
-		if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
-			echo $"Forcing file system integrity check due to default setting"
-		else
-			echo $"Not forcing file system integrity check due to default setting"
-		fi
-	fi
 	fsckoptions="$AUTOFSCK_OPT $fsckoptions"
 fi
 
-- 
cgit v1.2.1