Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix plymouth passphrase prompt with dracut 

plymouth --command splits the command on spaces which means
that zfs-load-key was getting the filesystem name enclosed
in single quotes (since 13c59bb76) 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 <behlendorf1@llnl.gov>
Signed-off-by: Michal Vasilek <michal@vasilek.cz>
Related-to: #9193
Related-to: #9202
Closes #12147
This commit is contained in:
Michal Vasilek 2021-06-26 07:43:25 +02:00 committed by GitHub
parent 2084e9f748
commit f20fb199e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/dracut/90zfs/zfs-lib.sh.in
View File

@ -179,8 +179,8 @@ ask_for_password() {
# Prompt for password with plymouth, if installed and running. # Prompt for password with plymouth, if installed and running.
if plymouth --ping 2>/dev/null; then if plymouth --ping 2>/dev/null; then
plymouth ask-for-password \ plymouth ask-for-password \
--prompt "$ply_prompt" --number-of-tries="$ply_tries" \ --prompt "$ply_prompt" --number-of-tries="$ply_tries" | \
--command="$ply_cmd" eval "$ply_cmd"
ret=$? ret=$?
else else
if [ "$tty_echo_off" = yes ]; then if [ "$tty_echo_off" = yes ]; then