X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=f6b8b8bf15fbe75c69ee1e3243b121f520d5bb0f;hb=d645cf3735a13845ef25042a1974dd72e96a64a7;hp=44bb12a164c26114aeedc6407d33bead68b7c4a8;hpb=3d5ce935a643cd8266b8f9e147723088bdff2800;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 44bb12a..f6b8b8b 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -275,7 +275,11 @@ try_mount ()
 
 	if [ -n "${old_mountp}" ]
 	then
-		mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+		if [ "${opts}" != "ro" ]
+		then
+			mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+		fi
+
 		mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
 	else
 		if [ -z "${fstype}" ]
@@ -313,6 +317,13 @@ find_cow_device ()
 				return
 			fi
 
+			if [ "${PERSISTENT}" = "nofiles" ]
+			then
+				# do not mount the device to find for image files
+				# just skip this
+				break
+			fi
+
 			case "$(get_fstype ${devname})" in
 				vfat|ext2|ext3|jffs2)
 					mkdir -p "${cow_backing}"