X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=0f4ef0d1378921cec5d5b51f2a46d4bcacbb4c00;hb=56d7b4e9c17311dfa071a5ac5cc80a2f1ff8e79f;hp=7e0b100232a894d84665b497e22f4b0a87dc873f;hpb=3d5ce935a643cd8266b8f9e147723088bdff2800;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 7e0b100..0f4ef0d 100755
--- a/scripts/live
+++ b/scripts/live
@@ -326,6 +326,15 @@ Arguments ()
 				export PERSISTENT
 				;;
 
+			persistent=*)
+				PERSISTENT="${ARGUMENT#persistent=}"
+				if [ -z "${PERSISTENT}" ]
+				then
+					PERSISTENT="Yes"
+				fi
+				export PERSISTENT
+				;;
+
 			nopersistent)
 				NOPERSISTENT="Yes"
 				export NOPERSISTENT
@@ -881,7 +890,13 @@ find_snap ()
 {
 	# Look for ${snap_label}.* in block devices
 	snap_label="${1}"
-	snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.jffs2")
+
+	if [ "${PERSISTENT}" != "nofiles" ]
+	then
+		# search for image files
+		snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.jffs2")
+	fi
+
 	if [ -z "${snapdata}" ]
 	then
 		snapdata=$(find_cow_device "${snap_label}")
@@ -1136,11 +1151,20 @@ setup_unionfs ()
 			# snapshots to be sure to really store some e.g key config files,
 			# but not on the same media
 			blacklistdev="${cowprobe}"
+			PERSISTENCE_IS_ON="Yes"
+			export PERSISTENCE_IS_ON
 		fi
 		# homecow just mount something on /home, this should be generalized some way
 		homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}")
+		if [ -b "${homecow}" ]
+		then
+			PERSISTENCE_IS_ON="Yes"
+			export PERSISTENCE_IS_ON
+		fi
 		root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}")
-		# This second type should be removed when snapshot grow smarter
+		# This second type should be removed when snapshot will get smarter,
+		# hence when "/etc/live-snapshot*list" will be supported also by
+		# ext2|ext3|jffs2 snapshot types.
 		home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}")
 
 		if [ -b "${cowprobe}" ]