X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=c3732feda1df0fd3fe6811d71d8317cc420622c3;hb=309e26afef1c8f61f2ed83abed6d821666172958;hp=952d4796ce4a0bf6c1a1328573a217dbb33a5b6a;hpb=3f02456e392ead3abf36bc181692fcb75c8f16f3;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 952d479..c3732fe 100755
--- a/scripts/live
+++ b/scripts/live
@@ -244,13 +244,18 @@ Arguments ()
 				export PERSISTENT
 				;;
 
-			persistent=*)
-				PERSISTENT="${ARGUMENT#persistent=}"
-				if [ -z "${PERSISTENT}" ]
-				then
-					PERSISTENT="Yes"
-				fi
-				export PERSISTENT
+			persistent-encryption=*)
+				PERSISTENT_ENCRYPTION="${ARGUMENT#*=}"
+				export PERSISTENT_ENCRYPTION
+				;;
+
+			persistent-media=*)
+				PERSISTENT_MEDIA="${ARGUMENT#*=}"
+				export PERSISTENT_MEDIA
+				;;
+			persistent-method=*)
+				PERSISTENT_METHOD="${ARGUMENT#*=}"
+				export PERSISTENT_METHOD
 				;;
 
 			persistent-path=*)
@@ -258,6 +263,11 @@ Arguments ()
 				export PERSISTENT_PATH
 				;;
 
+			persistent-storage=*)
+				PERSISTENT_STORAGE="${ARGUMENT#persistent-storage=}"
+				export PERSISTENT_STORAGE
+				;;
+
 			persistent-subtext=*)
 				root_persistence="${root_persistence}-${ARGUMENT#persistent-subtext=}"
 				home_persistence="${home_persistence}-${ARGUMENT#persistent-subtext=}"
@@ -380,6 +390,18 @@ Arguments ()
 		UNIONTYPE="aufs"
 		export UNIONTYPE
 	fi
+
+	if [ -n "${PERSISTENT}" ] && [ -z "${PERSISTENT_METHOD}" ]
+	then
+		PERSISTENT_METHOD="snapshot,overlay"
+		export PERSISTENT_METHOD
+	fi
+
+	if [ -n "${PERSISTENT}" ] && [ -z "${PERSISTENT_STORAGE}" ]
+	then
+		PERSISTENT_STORAGE="filesystem,file"
+		export PERSISTENT_STORAGE
+	fi
 }
 
 is_live_path ()
@@ -480,7 +502,16 @@ is_nice_device ()
 {
 	sysfs_path="${1#/sys}"
 
-	if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
+	if [ -e /lib/udev/path_id ]
+	then
+		# squeeze
+		PATH_ID="/lib/udev/path_id"
+	else
+		# wheezy/sid (udev >= 174)
+		PATH_ID="/sbin/udevadm test-builtin path_id"
+	fi
+
+	if "${PATH_ID}" "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
 	then
 		return 0
 	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -1035,13 +1066,13 @@ find_snap ()
 	black_listed_devices="${2}"
 	white_listed_devices="${3}"
 
-	if [ "${PERSISTENT}" != "nofiles" ]
+	if echo ${PERSISTENT_STORAGE} | grep -qw file
 	then
 		# search for image files
 		snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2" "${black_listed_devices}" "${white_listed_devices}")
 	fi
 
-	if [ -z "${snapdata}" ]
+	if echo ${PERSISTENT_STORAGE} | grep -qw filesystem && [ -z "${snapdata}" ]
 	then
 		snapdata=$(find_cow_device "${snap_label}" "${black_listed_devices}" "${white_listed_devices}")
 	fi
@@ -1199,7 +1230,7 @@ setup_unionfs ()
 
 	if [ "${UNIONTYPE}" = "aufs" ]
 	then
-		roopt="rr"
+		roopt="rr+wh"
 		noxino_opt="noxino,"
 	elif [ "${UNIONTYPE}" = "unionfs-fuse" ]
 	then
@@ -1324,6 +1355,7 @@ setup_unionfs ()
 	# Looking for "${root_persistence}" device or file
 	if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
 	then
+
 		if [ -z "${QUICKUSBMODULES}" ]
 		then
 			# Load USB modules
@@ -1351,30 +1383,49 @@ setup_unionfs ()
 			done
 		fi
 
-		# search for label and files (this could be hugely optimized)
-		cowprobe=$(find_cow_device "${root_persistence}" "${blacklistdev}" "${whitelistdev}")
-		if [ -b "${cowprobe}" ]
+		case "${PERSISTENT_MEDIA}" in
+			removable)
+				whitelistdev="$(removable_dev)"
+				;;
+			removable-usb)
+				whitelistdev="$(removable_usb_dev)"
+				;;
+			*)
+				whitelistdev=""
+				;;
+		esac
+
+		if echo ${PERSISTENT_METHOD} | grep -qw overlay
 		then
-			# Blacklist /cow device, to avoid inconsistent setups for overlapping snapshots
-			# makes sense to have both persistence for /cow and /home mounted, maybe also with
-			# snapshots to be sure to really store some e.g key config files,
-			# but not on the same media
-			blacklistdev="${cowprobe}"
-			PERSISTENCE_IS_ON="1"
-			export PERSISTENCE_IS_ON
+			# search for label and files (this could be hugely optimized)
+			cowprobe=$(find_cow_device "${root_persistence}" "${blacklistdev}" "${whitelistdev}")
+			if [ -b "${cowprobe}" ]
+			then
+				# Blacklist /cow device, to avoid inconsistent setups for overlapping snapshots
+				# makes sense to have both persistence for /cow and /home mounted, maybe also with
+				# snapshots to be sure to really store some e.g key config files,
+				# but not on the same media
+				blacklistdev="${cowprobe}"
+				PERSISTENCE_IS_ON="1"
+				export PERSISTENCE_IS_ON
+			fi
+			# homecow just mount something on /home, this should be generalized some way
+			homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}" "${whitelistdev}")
+			if [ -b "${homecow}" ]
+			then
+				PERSISTENCE_IS_ON="1"
+				export PERSISTENCE_IS_ON
+			fi
 		fi
-		# homecow just mount something on /home, this should be generalized some way
-		homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}" "${whitelistdev}")
-		if [ -b "${homecow}" ]
+
+		if echo ${PERSISTENT_METHOD} | grep -qw snapshot
 		then
-			PERSISTENCE_IS_ON="1"
-			export PERSISTENCE_IS_ON
+			root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}" "${whitelistdev}")
+			# This second type should be removed when snapshot will get smarter,
+			# hence when "/etc/live-snapshot*list" will be supported also by
+			# ext2|ext3|ext4|jffs2 snapshot types.
+			home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}" "${whitelistdev}")
 		fi
-		root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}" "${whitelistdev}")
-		# This second type should be removed when snapshot will get smarter,
-		# hence when "/etc/live-snapshot*list" will be supported also by
-		# ext2|ext3|ext4|jffs2 snapshot types.
-		home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}" "${whitelistdev}")
 
 		if [ -b "${cowprobe}" ]
 		then
@@ -1665,7 +1716,7 @@ check_dev ()
 			echo ${mountpoint}
 			return 0
 		else
-			umount ${mountpoint}
+			umount ${mountpoint} 2>/dev/null
 		fi
 	fi