projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disabling persistent-encryption=luks if dependencies are unavailable.
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
bbed909
..
33d2ee7
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-344,20
+344,8
@@
find_persistent_media ()
luks_device=""
# Checking for a luks device
luks_device=""
# Checking for a luks device
- if [ "${PERSISTENT_ENCRYPTION}" = "luks" ]
&& [ -e /sbin/cryptsetup ]
+ if [ "${PERSISTENT_ENCRYPTION}" = "luks" ]
then
then
- if ! modprobe dm-crypt
- then
- log_warning_msg "Unable to load module dm-crypt"
- continue
- fi
-
- if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
- then
- log_warning_msg "cryptsetup in unavailable"
- continue
- fi
-
if ! /sbin/cryptsetup isLuks ${dev}
then
# skip device since we strictly want luks devices
if ! /sbin/cryptsetup isLuks ${dev}
then
# skip device since we strictly want luks devices