projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changing persistent-encryption to accept a list TYPE... instead.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
970853c
..
c28314f
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-395,19
+395,23
@@
Arguments ()
export UNIONTYPE
fi
export UNIONTYPE
fi
- if [ "${PERSISTENT_ENCRYPTION}" = "luks" ]
+ 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"
then
if ! modprobe dm-crypt
then
log_warning_msg "Unable to load module dm-crypt"
- PERSISTENT_ENCRYPTION=
"none"
+ 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"
export PERSISTENT_ENCRYPTION
fi
if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
then
log_warning_msg "cryptsetup in unavailable"
- PERSISTENT_ENCRYPTION=
"none"
+ PERSISTENT_ENCRYPTION=
$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
export PERSISTENT_ENCRYPTION
fi
fi
export PERSISTENT_ENCRYPTION
fi
fi