kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(crypt): remove quotes from cryptsetupopts 

Fixes #1528.
master
lapseofreason 2021-06-08 16:01:58 +02:00 committed by Jóhann B. Guðmundsson
parent 86bf2533d7
commit e0abf88a15
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules.d/90crypt/cryptroot-ask.sh
View File

@ -138,8 +138,9 @@ unset allowdiscards
ask_passphrase=1 ask_passphrase=1


if [ -n "$luksfile" -a "$luksfile" != "none" -a -e "$luksfile" ]; then if [ -n "$luksfile" -a "$luksfile" != "none" -a -e "$luksfile" ]; then
# shellcheck disable=SC2086
if readkey "$luksfile" / "$device" \ if readkey "$luksfile" / "$device" \
| cryptsetup -d - "$cryptsetupopts" luksOpen "$device" "$luksname"; then | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname"; then
ask_passphrase=0 ask_passphrase=0
fi fi
elif [ "$is_keysource" -ne 0 ]; then elif [ "$is_keysource" -ne 0 ]; then
@ -164,8 +165,9 @@ else
unset tmp unset tmp


info "Using '$keypath' on '$keydev'" info "Using '$keypath' on '$keydev'"
# shellcheck disable=SC2086
readkey "$keypath" "$keydev" "$device" \ readkey "$keypath" "$keydev" "$device" \
| cryptsetup -d - "$cryptsetupopts" luksOpen "$device" "$luksname" \ | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname" \
&& ask_passphrase=0 && ask_passphrase=0
unset keypath keydev unset keypath keydev
break break