From: Michal Suchanek <hramrach@centrum.cz>
Date: Sat, 31 May 2008 19:18:47 +0000 (+0200)
Subject: Workaround loop-aes-utils losetup incompatibility
X-Git-Tag: debian/2.0.15-1~542
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=f02ff60da1a862bb4eb0631cb9b7e527ffa1f32e;hp=9be31760d902a1728a4b786f2a8844697bad5038;p=live-boot-grml.git

Workaround loop-aes-utils losetup incompatibility

Pass -r option to losetup when setting up loop device for root image
so that readonly files can be set up as well.
---

diff --git a/scripts/live b/scripts/live
index 3428cca..0d84533 100755
--- a/scripts/live
+++ b/scripts/live
@@ -498,7 +498,7 @@ get_backing_device ()
 {
 	case "${1}" in
 		*.squashfs|*.ext2|*.ext3|*.jffs2)
-			echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}")
+			echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}" "${2}")
 			;;
 
 		*.dir)
@@ -965,7 +965,7 @@ setup_unionfs ()
 			rofslist="${image} ${rofslist}"
 		elif [ -f "${image}" ]
 		then
-			backdev=$(get_backing_device "${image}")
+			backdev=$(get_backing_device "${image}" "-r")
 			fstype=$(get_fstype "${backdev}")
 
 			if [ "${fstype}" = "unknown" ]
diff --git a/scripts/live-helpers b/scripts/live-helpers
index cc73aa3..02c3e55 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -167,6 +167,7 @@ setup_loop ()
 	local pattern=${3}
 	local offset=${4}
 	local encryption=${5}
+	local readonly=${6}
 
 	modprobe -q -b "${module}"
 	udevsettle
@@ -178,6 +179,11 @@ setup_loop ()
 			dev=$(sys2dev "${loopdev}")
 			options=''
 
+			if [ -n ${readonly} ]
+			then
+				options="${options} -r"
+			fi
+
 			if [ 0 -lt "${offset}" ]
 			then
 				options="${options} -o ${offset}"