Merge pull request #50281 from dasJ/luks-checkexist

nixos/luksroot: Check whether the device already exists
2018-12-02 00:28:13 +01:00 · 2018-12-02 00:28:13 +01:00 · 3fbdd4705a
commit 3fbdd4705a
parent eb755503b2 9cd4ce98bf
1 changed files with 5 additions and 0 deletions
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@ -118,6 +118,11 @@ let
    do_open_passphrase() {
        local passphrase

+        # Return if already unlocked
+        if ! cryptsetup status "${name}" > /dev/null; then
+          return
+        fi
+
        while true; do
            echo -n "Passphrase for ${device}: "
            passphrase=