X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=867efc0f8d3e05cb5eb5830f3f9d819ea69fcc17;hb=bd2cfbec5fe67ea696162c1caa5c80187a070bee;hp=22d221041f4953049eab0c8cc1effc2460f3345b;hpb=b453283b5367f1ee985012f15de78bee18ad2b78;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 22d2210..867efc0 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
@@ -1109,6 +1109,7 @@ setup_unionfs ()
 	else
 		cowdevice="tmpfs"
 		cow_fstype="tmpfs"
+		cow_mountopt="rw,noatime,mode=755"
 	fi
 
 	if [ "${cow_fstype}" = "nfs" ]
@@ -1118,8 +1119,6 @@ setup_unionfs ()
 		nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
 			panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
 	else
-		# make sure cow_mountopt is set:
-		[ -n "$cow_mountopt" ] || cow_mountopt="rw,noatime,mode=755"
 		mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
 			panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
 	fi