[SCM] debian-live branch, master, updated. debian/1.136.3-1-3-gc692341

[Chris Lamb]

The following commit has been merged in the master branch:
commit b2fd2067bf8e3a9ed0d8c5577647bacd49aa3b71
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Jul 31 22:34:55 2008 +0100

    Don't use /sbin/losetup to test for '-r' option when the scripts just use "lostup"
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live b/scripts/live
index 22d2210..2cfa5e1 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1016,7 +1016,7 @@ setup_unionfs ()
 			rofslist="${image} ${rofslist}"
 		elif [ -f "${image}" ]
 		then
-			if /sbin/losetup --help 2>&1 | grep -q -- "-r\b"
+			if losetup --help 2>&1 | grep -q -- "-r\b"
 			then
 				backdev=$(get_backing_device "${image}" "-r")
 			else
diff --git a/scripts/live-helpers b/scripts/live-helpers
index b8b9cf1..f99fa56 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -178,7 +178,7 @@ setup_loop ()
 
 			if [ -n ${readonly} ]
 			then
-				if /sbin/losetup --help 2>&1 | grep -q -- "-r\b"
+				if losetup --help 2>&1 | grep -q -- "-r\b"
 				then
 					options="${options} -r"
 				fi

-- 
debian-live