zfs-mount-generator: Skip loading already loaded key

Don't ask for the password / try to load the key if the key for the encryptionroot is already loaded. Closes openzfs#9495 Signed-off-by: Witaut Bajaryn <[email protected]>
vozhyk- · Oct 29, 2019 · 97e9942 · 97e9942
1 parent d46f0de
commit 97e9942
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/etc/systemd/system-generators/zfs-mount-generator.in b/etc/systemd/system-generators/zfs-mount-generator.in
@@ -182,6 +182,8 @@ process_line() {
         keyloadcmd="@sbindir@/zfs load-key '${dataset}'"
       elif [ "${p_keyloc}" = "prompt" ] ; then
         keyloadcmd="sh -c 'set -eu;"\
+"keystatus=\"\$\$(@sbindir@/zfs get -H -o value keystatus \"${dataset}\")\";"\
+"[ \"\$\$keystatus\" = \"available\" ] && exit 0;"\
 "count=0;"\
 "while [ \$\$count -lt 3 ];do"\
 "  systemd-ask-password --id=\"zfs:${dataset}\""\