projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating to standards version 3.9.3.
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
9e45517
..
3109356
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-46,9
+46,9
@@
storage_devices()
do
fulldevname=$(sys2dev "${sysblock}")
do
fulldevname=$(sys2dev "${sysblock}")
- if echo "${black_listed_devices}" | grep -q
w "${fulldevname}
" || \
+ if echo "${black_listed_devices}" | grep -q
e "\<${fulldevname}\>
" || \
[ -n "${white_listed_devices}" ] && \
[ -n "${white_listed_devices}" ] && \
- echo "${white_listed_devices}" | grep -
vqw "${fulldevname}
"
+ echo "${white_listed_devices}" | grep -
qve "\<${fulldevname}\>
"
then
# skip this device entirely
continue
then
# skip this device entirely
continue
@@
-58,7
+58,7
@@
storage_devices()
do
devname=$(sys2dev "${dev}")
do
devname=$(sys2dev "${dev}")
- if echo "${black_listed_devices}" | grep -q
w "${devname}
"
+ if echo "${black_listed_devices}" | grep -q
e "\<${devname}\>
"
then
# skip this subdevice
continue
then
# skip this subdevice
continue
@@
-316,6
+316,10
@@
open_luks_device ()
dev="${1}"
name="$(basename ${dev})"
opts="--key-file=-"
dev="${1}"
name="$(basename ${dev})"
opts="--key-file=-"
+ if [ -n "${PERSISTENT_READONLY}" ]
+ then
+ opts="${opts} --readonly"
+ fi
load_keymap
load_keymap
@@
-375,7
+379,7
@@
find_persistent_media ()
luks_device=""
# Checking for a luks device
luks_device=""
# Checking for a luks device
- if echo ${PERSISTENT_ENCRYPTION} | grep -q
w luks
&& \
+ if echo ${PERSISTENT_ENCRYPTION} | grep -q
e "\<luks\>"
&& \
/sbin/cryptsetup isLuks ${dev}
then
if luks_device=$(open_luks_device "${dev}")
/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
# skip $dev since we failed/chose not to open it
continue
fi
- elif echo ${PERSISTENT_ENCRYPTION} | grep -q
wv none
+ elif echo ${PERSISTENT_ENCRYPTION} | grep -q
ve "\<none\>"
then
# skip $dev since we don't allow unencrypted storage
continue
fi
then
# skip $dev since we don't allow unencrypted storage
continue
fi
- if echo ${PERSISTENT_STORAGE} | grep -q
w filesystem
+ if echo ${PERSISTENT_STORAGE} | grep -q
e "\<filesystem\>"
then
for label in ${overlays} ${snapshots}
do
then
for label in ${overlays} ${snapshots}
do
@@
-406,7
+410,7
@@
find_persistent_media ()
done
fi
done
fi
- if echo ${PERSISTENT_STORAGE} | grep -q
w file
+ if echo ${PERSISTENT_STORAGE} | grep -q
e "\<file\>"
then
devfstype="$(get_fstype ${dev})"
overlay_on_dev=""
then
devfstype="$(get_fstype ${dev})"
overlay_on_dev=""