From f5302bcc273b3b7f557e3b30c6457d9c20d05b56 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 12 Mar 2009 07:12:21 +0100
Subject: [PATCH] Respecting media timeout even when specificing media device
 manually.

---
 scripts/live | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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
 
-- 
2.1.4