Skip to content

Commit

Permalink
Merge pull request #158 from aafeijoo-suse/055-bsc1197635
Browse files Browse the repository at this point in the history
fix(crypt): remove quotes from cryptsetupopts (bsc#1197635)
  • Loading branch information
aafeijoo-suse authored Apr 5, 2022
2 parents 2523082 + 153f116 commit 5cf14ff
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions modules.d/90crypt/cryptroot-ask.sh
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,9 @@ unset allowdiscards
ask_passphrase=1

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

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

0 comments on commit 5cf14ff

Please sign in to comment.