diff options
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 26 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 3 |
2 files changed, 4 insertions, 25 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 15881b6d371..8dad09c8920 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -36,7 +36,7 @@ let ${optionalString (header != null) "--header=${header}"} \ ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"} \ > /.luksopen_args - get_password "Enter LUKS Passphrase" cryptsetup-askpass + cryptsetup-askpass rm /.luksopen_args } @@ -78,7 +78,9 @@ let for try in $(seq 3); do ${optionalString yubikey.twoFactor '' - k_user="$(get_password "Enter two-factor passphrase" cat)" + echo -n "Enter two-factor passphrase: " + read -s k_user + echo ''} if [ ! -z "$k_user" ]; then @@ -461,26 +463,6 @@ in ''} ''; - boot.initrd.preDeviceCommands = '' - get_password() { - local ret - local reply - local tty_stat - - tty_stat="$(stty -g)" - stty -echo - for i in `seq 1 3`; do - echo -n "$1: " - read reply - echo "$reply" | "$2" - if [ "$?" = "0" ]; then - break - fi - done - stty "$tty_stat" - } - ''; - boot.initrd.preLVMCommands = concatStrings (mapAttrsToList openCommand preLVM); boot.initrd.postDeviceCommands = concatStrings (mapAttrsToList openCommand postLVM); diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 6b1bf0b3e02..d4277ebd80c 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -14,9 +14,6 @@ export LVM_SUPPRESS_FD_WARNINGS=true fail() { if [ -n "$panicOnFail" ]; then exit 1; fi - # If we have a splash screen started, quit it. - command -v plymouth >/dev/null 2>&1 && plymouth quit - # If starting stage 2 failed, allow the user to repair the problem # in an interactive shell. cat <<EOF |