projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding (experimental) forcepersistentfsck bootoption to force fsck on root persistenc...
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
9c5bf21
..
d5ad29f
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-328,13
+328,13
@@
find_cow_device ()
fi
# Checking for a luks device
fi
# Checking for a luks device
- if [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
+ if [
"${PERSISTENT}" = "cryptsetup" ] && [
-e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
then
while true
do
load_keymap
then
while true
do
load_keymap
- /lib/cryptsetup/askpass "Enter passphrase for ${pers_label} on ${devname}: " /sbin/cryptsetup -T 1 luksOpen ${devname} $(basename ${devname}) --key-file=-
+ /lib/cryptsetup/askpass "Enter passphrase for ${pers_label} on ${devname}: "
|
/sbin/cryptsetup -T 1 luksOpen ${devname} $(basename ${devname}) --key-file=-
error=${?}
devname="/dev/mapper/$(basename ${devname})"
error=${?}
devname="/dev/mapper/$(basename ${devname})"
@@
-367,7
+367,7
@@
find_cow_device ()
then
# do not mount the device to find for image files
# just skip this
then
# do not mount the device to find for image files
# just skip this
- break
+ continue
fi
case "$(get_fstype ${devname})" in
fi
case "$(get_fstype ${devname})" in