[SCM] Debian Live initramfs hook branch, master, updated. 1.156.1-1-11-gaec85a0

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 56f8713ecff82b0f8c6a1c4709221e62a60db840
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Mar 12 07:12:21 2009 +0100

    Respecting media timeout even when specificing media device manually.

diff --git a/scripts/live b/scripts/live
index eb04d27..5d5b978 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1391,21 +1391,21 @@ find_livefs ()
 {
 	timeout="${1}"
 
-	# first look at the one specified in the command line
-	if [ ! -z "${LIVE_MEDIA}" ]
+	# don't start autodetection before timeout has expired
+	if [ -n "${LIVE_MEDIA_TIMEOUT}" ]
 	then
-		if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
+		if [ "${timeout}" -lt "${LIVE_MEDIA_TIMEOUT}" ]
 		then
-			return 0
+			return 1
 		fi
 	fi
 
-	# don't start autodetection before timeout has expired
-	if [ -n "${LIVE_MEDIA_TIMEOUT}" ]
+	# first look at the one specified in the command line
+	if [ ! -z "${LIVE_MEDIA}" ]
 	then
-		if [ "${timeout}" -lt "${LIVE_MEDIA_TIMEOUT}" ]
+		if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
 		then
-			return 1
+			return 0
 		fi
 	fi
 

-- 
Debian Live initramfs hook