X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Flive-helpers;h=31093563f1404c83b7b397ef1aa2292d1aba8054;hb=f12da76bfe6fa2d134788541d7c74512a3ebb17a;hp=9e455178ce423e6c848bdec993a5b86fcabd7951;hpb=ef22a990570cd3658c7a693796e4470994b86fb9;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 9e45517..3109356 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -46,9 +46,9 @@ storage_devices()
 	do
 		fulldevname=$(sys2dev "${sysblock}")
 
-		if echo "${black_listed_devices}" | grep -qw "${fulldevname}" || \
+		if echo "${black_listed_devices}" | grep -qe "\<${fulldevname}\>" || \
 			[ -n "${white_listed_devices}" ] && \
-			echo "${white_listed_devices}" | grep -vqw "${fulldevname}"
+			echo "${white_listed_devices}" | grep -qve "\<${fulldevname}\>"
 		then
 			# skip this device entirely
 			continue
@@ -58,7 +58,7 @@ storage_devices()
 		do
 			devname=$(sys2dev "${dev}")
 
-			if echo "${black_listed_devices}" | grep -qw "${devname}"
+			if echo "${black_listed_devices}" | grep -qe "\<${devname}\>"
 			then
 				# skip this subdevice
 				continue
@@ -316,6 +316,10 @@ open_luks_device ()
 	dev="${1}"
 	name="$(basename ${dev})"
 	opts="--key-file=-"
+	if [ -n "${PERSISTENT_READONLY}" ]
+	then
+		opts="${opts} --readonly"
+	fi
 
 	load_keymap
 
@@ -375,7 +379,7 @@ find_persistent_media ()
 		luks_device=""
 
 		# Checking for a luks device
-		if echo ${PERSISTENT_ENCRYPTION} | grep -qw luks && \
+		if echo ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>" && \
 		   /sbin/cryptsetup isLuks ${dev}
 		then
 			if luks_device=$(open_luks_device "${dev}")
@@ -385,13 +389,13 @@ find_persistent_media ()
 				# skip $dev since we failed/chose not to open it
 				continue
 			fi
-		elif echo ${PERSISTENT_ENCRYPTION} | grep -qwv none
+		elif echo ${PERSISTENT_ENCRYPTION} | grep -qve "\<none\>"
 		then
 			# skip $dev since we don't allow unencrypted storage
 			continue
 		fi
 
-		if echo ${PERSISTENT_STORAGE} | grep -qw filesystem
+		if echo ${PERSISTENT_STORAGE} | grep -qe "\<filesystem\>"
 		then
 			for label in ${overlays} ${snapshots}
 			do
@@ -406,7 +410,7 @@ find_persistent_media ()
 			done
 		fi
 
-		if echo ${PERSISTENT_STORAGE} | grep -qw file
+		if echo ${PERSISTENT_STORAGE} | grep -qe "\<file\>"
 		then
 			devfstype="$(get_fstype ${dev})"
 			overlay_on_dev=""