Skip to content

Commit

Permalink
Fix plymouth passphrase prompt with dracut
Browse files Browse the repository at this point in the history
plymouth --command splits the command on spaces which means
that zfs-load-key was getting the filesystem name enclosed
in single quotes (since 13c59bb) and failing. This commit
fixes it by piping the password directly to the command
similar to how it's done in other scripts (initramfs,
dracut without plymouth).

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Michal Vasilek <[email protected]>
Related-to: openzfs#9193
Related-to: openzfs#9202
Closes openzfs#12147
  • Loading branch information
paper42 authored and behlendorf committed Jun 29, 2021
1 parent 57ce66d commit 4ebda5d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/dracut/90zfs/zfs-lib.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ ask_for_password() {
# Prompt for password with plymouth, if installed and running.
if plymouth --ping 2>/dev/null; then
plymouth ask-for-password \
--prompt "$ply_prompt" --number-of-tries="$ply_tries" \
--command="$ply_cmd"
--prompt "$ply_prompt" --number-of-tries="$ply_tries" | \
eval "$ply_cmd"
ret=$?
else
if [ "$tty_echo_off" = yes ]; then
Expand Down

0 comments on commit 4ebda5d

Please sign in to comment.