]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Skip loading already loaded key
authorWitaut Bajaryn <vitaut.bayaryn@gmail.com>
Fri, 8 Nov 2019 22:34:07 +0000 (23:34 +0100)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 8 Nov 2019 22:34:07 +0000 (14:34 -0800)
commit6c7023a5326cc999cfaced931ee2498642d5e63f
tree973cb3e4852c0c4f84134b0d0b6142c8a2743755
parent734de7ced12f376e8f07ad8cec3ccc1abf9779b1
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.  The user might have loaded the key
manually or by other means before the scripts get called.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tom Caputi <tcaputi@datto.com>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: Witaut Bajaryn <vitaut.bayaryn@gmail.com>
Closes #9495
Closes #9529
contrib/dracut/90zfs/mount-zfs.sh.in
contrib/dracut/90zfs/zfs-load-key.sh.in
contrib/initramfs/scripts/zfs.in
etc/systemd/system-generators/zfs-mount-generator.in