From 11dd31df207ec365db599d8201e140ee663ef398 Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@volny.cz>
Date: Sun, 19 Mar 2006 14:51:42 +0000
Subject: Allow -y in $fsckoptions (#143351)

---
 rc.d/rc.sysinit | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 3056aafc..d4400463 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -307,16 +307,20 @@ if [ -f /etc/sysconfig/readonly-root ]; then
         . /etc/rc.readonly
     fi
 fi
- 
+
+if ! [[ " $fsckoptions" =~ " -y" ]]; then
+    	fsckoptions="-a $fsckoptions"
+fi
+
 _RUN_QUOTACHECK=0
 if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then
 
         STRING=$"Checking filesystems"
 	echo $STRING
 	if [ "${RHGB_STARTED}" != "0" -a -w /etc/rhgb/temp/rhgb-console ]; then
-		fsck -T -t noopts=_netdev -A -a $fsckoptions > /etc/rhgb/temp/rhgb-console
+		fsck -T -t noopts=_netdev -A $fsckoptions > /etc/rhgb/temp/rhgb-console
 	else
-		fsck -T -t noopts=_netdev -A -a $fsckoptions
+		fsck -T -t noopts=_netdev -A $fsckoptions
 	fi
 	rc=$?
 	
-- 
cgit v1.2.1