X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=ee363c3e46cc1e07bfe65ed5d3fd5c498784baa6;hb=41e9edcaf36bf2b7d56eee71bee80703176d111e;hp=62b52240bdac40a0fbaa8ca3e5a275b175a3f148;hpb=eedba054799e9809e7178938e372ece8c58d15c9;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 62b5224..ee363c3 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1008,7 +1008,12 @@ setup_unionfs ()
 			rofslist="${image} ${rofslist}"
 		elif [ -f "${image}" ]
 		then
-			backdev=$(get_backing_device "${image}" "-r")
+			if /sbin/losetup --help 2>&1 | grep -q -- "-r\b"
+			then
+				backdev=$(get_backing_device "${image}" "-r")
+			else
+				backdev=$(get_backing_device "${image}")
+			fi
 			fstype=$(get_fstype "${backdev}")
 
 			if [ "${fstype}" = "unknown" ]
@@ -1173,7 +1178,7 @@ setup_unionfs ()
 
 	# shows cow fs on /cow for use by live-snapshot
 	mkdir -p "${rootmnt}/live/cow"
-	mount -o move /cow "${rootmnt}/live/cow"
+	mount -o move /cow "${rootmnt}/live/cow" || mount -o bind /cow "${rootmnt}/live/cow" || [ "${quiet}" != "y" ] && log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow"
 }
 
 check_dev ()