X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=c28314f1a99e75b0f709c0543ea6b27730bd76f4;hb=ef22a990570cd3658c7a693796e4470994b86fb9;hp=e0663b6920e47e5f2608a721473344c889e404d0;hpb=6829648b938cf440a572b7cc1b0a0dddb8b16dc8;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index e0663b6..c28314f 100755
--- a/scripts/live
+++ b/scripts/live
@@ -262,6 +262,10 @@ Arguments ()
 				PERSISTENT_PATH="${ARGUMENT#persistent-path=}"
 				export PERSISTENT_PATH
 				;;
+			persistent-read-only)
+				PERSISTENT_READONLY="Yes"
+				export PERSISTENT_READONLY
+				;;
 
 			persistent-storage=*)
 				PERSISTENT_STORAGE="${ARGUMENT#persistent-storage=}"
@@ -391,6 +395,27 @@ Arguments ()
 		export UNIONTYPE
 	fi
 
+	if [ -z "${PERSISTENT_ENCRYPTION}" ]
+	then
+		PERSISTENT_ENCRYPTION="none"
+		export PERSISTENT_ENCRYPTION
+	elif echo ${PERSISTENT_ENCRYPTION} | grep -qw luks
+	then
+		if ! modprobe dm-crypt
+		then
+			log_warning_msg "Unable to load module dm-crypt"
+			PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
+			export PERSISTENT_ENCRYPTION
+		fi
+
+		if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
+		then
+			log_warning_msg "cryptsetup in unavailable"
+			PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
+			export PERSISTENT_ENCRYPTION
+		fi
+	fi
+
 	if [ -n "${PERSISTENT}" ] && [ -z "${PERSISTENT_METHOD}" ]
 	then
 		PERSISTENT_METHOD="snapshot,overlay"
@@ -1169,7 +1194,10 @@ try_snap ()
 		return 1
 	fi
 
-	echo "export ${snap_type}SNAP=${snap_relpath}:${snapdev}:${snapfile}" >> snapshot.conf # for resync on reboot/halt
+	if [ -z ${PERSISTENT_READONLY} ]
+	then
+		echo "export ${snap_type}SNAP=${snap_relpath}:${snapdev}:${snapfile}" >> snapshot.conf # for resync on reboot/halt
+	fi
 	return 0
 }