]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Systemd mount generator: don't fail keyload from file if already loaded
authorInsanePrawn <Insane.Prawny@gmail.com>
Mon, 9 Mar 2020 18:09:09 +0000 (19:09 +0100)
committerGitHub <noreply@github.com>
Mon, 9 Mar 2020 18:09:09 +0000 (11:09 -0700)
commitff2f960b2492ecb3db6a2614251240a77874ab93
tree40519b32aea28b3d88a7035b784dd303ef9c743d
parent2b95e91132880309d67a537fe727bdef9f4af463
Systemd mount generator: don't fail keyload from file if already loaded

Previously the generated keyload units for encryption roots with
keylocation=file://* didn't contain the code to detect if the key
was already loaded and would be marked failed in such situations.

Move the code to check whether the key is already loaded
from keylocation=prompt handling to general key loading code.

Reviewed-by: Richard Laager <rlaager@wiktel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: InsanePrawn <insane.prawny@gmail.com>
Closes #10103
etc/systemd/system-generators/zfs-mount-generator.in