From: Chris Lamb Date: Thu, 31 Jul 2008 21:34:55 +0000 (+0100) Subject: Don't use /sbin/losetup to test for '-r' option when the scripts just use "lostup" X-Git-Tag: debian/2.0.15-1~496 X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=eabd839b32b303c4176a891d2d42a1aeef8fc2da;p=live-boot-grml.git Don't use /sbin/losetup to test for '-r' option when the scripts just use "lostup" --- 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