Merge pull request #6 from t0b3/patch-2

Update 00-crypt.sh
master v40
Fabio Erculiani 11 years ago
commit a73aefd936

@ -275,13 +275,12 @@ start_luks() {
if [ -n "${CRYPT_ROOTS}" ]; then if [ -n "${CRYPT_ROOTS}" ]; then
root_or_swap=1 root_or_swap=1
if _open_luks "root"; then
# force REAL_ROOT= to some value if not set # force REAL_ROOT= to some value if not set
# this is mainly for backward compatibility, # this is mainly for backward compatibility,
# because grub2 always sets a valid root= # because grub2 always sets a valid root=
# and user must have it as well. # and user must have it as well.
[ -z "${REAL_ROOT}" ] && REAL_ROOT="/dev/mapper/root" [ -z "${REAL_ROOT}" ] && REAL_ROOT="/dev/mapper/root"
fi _open_luks "root"
fi fi
[ -n "${CRYPT_SWAP_KEY}" ] && [ -z "${CRYPT_SWAP_KEYDEV}" ] \ [ -n "${CRYPT_SWAP_KEY}" ] && [ -z "${CRYPT_SWAP_KEYDEV}" ] \
@ -289,10 +288,9 @@ start_luks() {
if [ -n "${CRYPT_SWAPS}" ]; then if [ -n "${CRYPT_SWAPS}" ]; then
root_or_swap=1 root_or_swap=1
if _open_luks "swap"; then
# force REAL_RESUME= to some value if not set # force REAL_RESUME= to some value if not set
[ -z "${REAL_RESUME}" ] && REAL_RESUME="/dev/mapper/swap" [ -z "${REAL_RESUME}" ] && REAL_RESUME="/dev/mapper/swap"
fi _open_luks "swap"
fi fi
if [ -n "${root_or_swap}" ]; then if [ -n "${root_or_swap}" ]; then

Loading…
Cancel
Save