From fabe918dee7da26d177d67d4aa8fe3fd6e83e513 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Wed, 23 Aug 2006 09:22:54 +0200
Subject: - improved nfsroo parsing - added rootdelay and rootfstype bootargs -
 document this changes - initrd-tools backward compatible mdadm assembe and
 then run mdrun - update-initramfs really checkout use_bootloader from
 /etc/kernel-img.conf - tighter klibc deps

---
 scripts/local | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'scripts/local')

diff --git a/scripts/local b/scripts/local
index 0b9baab..9d71a5e 100644
--- a/scripts/local
+++ b/scripts/local
@@ -11,11 +11,18 @@ mountroot ()
 	# to deal with removable devices
 	if [ ! -e "${ROOT}" ]; then
 		log_begin_msg "Waiting for root file system..."
+
+		# Default delay is 180s
+		if [ -z "${ROOTDELAY}" ]; then
+			slumber=180
+		else
+			slumber=${ROOTDELAY}
+		fi
 		if [ -x /sbin/usplash_write ]; then
-			/sbin/usplash_write "TIMEOUT 180" || true
+			/sbin/usplash_write "TIMEOUT ${slumber}" || true
 		fi
 
-		slumber=1800
+		slumber=$(( ${slumber} * 10 ))
 		while [ ${slumber} -gt 0 -a ! -e "${ROOT}" ]; do
 			/bin/sleep 0.1
 			slumber=$(( ${slumber} - 1 ))
@@ -38,8 +45,12 @@ mountroot ()
 		panic "ALERT!  ${ROOT} does not exist.  Dropping to a shell!"
 	done
 
-	# Get the root filesystem type
-	eval $(fstype < ${ROOT})
+	# Get the root filesystem type if not set
+	if [ -z "${ROOTFSTYPE}" ]; then
+		eval $(fstype < ${ROOT})
+	else 
+		FSTYPE=${ROOTFSTYPE}
+	fi
 
 	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-premount"
 	run_scripts /scripts/local-premount
-- 
cgit v1.2.3