From: Daniel Baumann <daniel@debian.org>
Date: Tue, 11 Nov 2008 16:52:41 +0000 (+0100)
Subject: Merging casper 1.144.
X-Git-Tag: debian/2.0.15-1~401
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=95cdfc252b7b9ee537bc2584717a25ff04971015;p=live-boot-grml.git

Merging casper 1.144.
---

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 18a4fac..1f46c8d 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,13 @@
+casper (1.144) intrepid; urgency=low
+
+  * Bump media detection timeout to a minute; thanks to Tormod Volden and
+    Steve Beattie for analysis (LP: #258432).
+  * Note that this changes (fixes?) the semantics of LIVEMEDIA_TIMEOUT due
+    to not using hex values in a for loop which aren't understood by test
+    -lt (thanks, Steve Beattie).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 26 Sep 2008 18:35:13 +0100
+
 casper (1.143) intrepid; urgency=low
 
   * scripts/casper-bottom/30accessibility &
diff --git a/scripts/live b/scripts/live
index 9b9a443..efd0327 100755
--- a/scripts/live
+++ b/scripts/live
@@ -799,11 +799,13 @@ do_nfsmount ()
 
 	log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
 
-	# FIXME: This for loop is an ugly HACK round an nfs bug
-	for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13
+	# FIXME: This while loop is an ugly HACK round an nfs bug
+	i=0
+	while [ "$i" -lt 60 ]
 	do
 		nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && rc=0 && break
 		sleep 1
+		i="$(($i + 1))"
 	done
 
 	return ${rc}
@@ -1461,7 +1463,8 @@ mountroot ()
 			livefs_root=${ROOT}
 		else
 			# Scan local devices for the image
-			for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+			i=0
+			while [ "$i" -lt 60 ]
 			do
 				livefs_root=$(find_livefs ${i})
 
@@ -1471,6 +1474,7 @@ mountroot ()
 				fi
 
 				sleep 1
+				i="$(($i + 1))"
 			done
 		fi
 	fi