summaryrefslogtreecommitdiff
path: root/scripts/live
diff options
context:
space:
mode:
authorMichal Suchanek <hramrach@centrum.cz>2008-05-31 21:18:47 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:47:59 +0100
commitf02ff60da1a862bb4eb0631cb9b7e527ffa1f32e (patch)
tree16686c55dd231cf866efbaee8619901af59da1a5 /scripts/live
parent9be31760d902a1728a4b786f2a8844697bad5038 (diff)
downloadlive-boot-f02ff60da1a862bb4eb0631cb9b7e527ffa1f32e.tar.gz
live-boot-f02ff60da1a862bb4eb0631cb9b7e527ffa1f32e.zip
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.
Diffstat (limited to 'scripts/live')
-rwxr-xr-xscripts/live4
1 files changed, 2 insertions, 2 deletions
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" ]