diff options
| author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2017-12-14 13:43:14 +0100 |
|---|---|---|
| committer | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2017-12-14 13:43:14 +0100 |
| commit | b8a85fccd9db8f0fd9ac555605c728ca731b788e (patch) | |
| tree | fe51d33da7bb8cf210253f8642b030879f9adddd /nixos/modules/system/boot/luksroot.nix | |
| parent | 601fc20248d7c1b4cd3c33209fbc419af8ae0c04 (diff) | |
| download | nixpkgs-b8a85fccd9db8f0fd9ac555605c728ca731b788e.tar nixpkgs-b8a85fccd9db8f0fd9ac555605c728ca731b788e.tar.gz nixpkgs-b8a85fccd9db8f0fd9ac555605c728ca731b788e.tar.bz2 nixpkgs-b8a85fccd9db8f0fd9ac555605c728ca731b788e.tar.lz nixpkgs-b8a85fccd9db8f0fd9ac555605c728ca731b788e.tar.xz nixpkgs-b8a85fccd9db8f0fd9ac555605c728ca731b788e.tar.zst nixpkgs-b8a85fccd9db8f0fd9ac555605c728ca731b788e.zip | |
luksroot.nix: rename fallback to fallbackToPassword
Diffstat (limited to 'nixos/modules/system/boot/luksroot.nix')
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index a5581b2bdc4..a23e0c60de9 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -5,7 +5,7 @@ with lib; let luks = config.boot.initrd.luks; - openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, fallback, ... }: assert name' == name; '' + openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, fallbackToPassword, ... }: assert name' == name; '' # Wait for a target (e.g. device, keyFile, header, ...) to appear. wait_target() { @@ -45,10 +45,10 @@ let ${optionalString (header != null) "--header=${header}"} \ > /.luksopen_args ${optionalString (keyFile != null) '' - ${optionalString fallback "if [ -e ${keyFile} ]; then"} + ${optionalString fallbackToPassword "if [ -e ${keyFile} ]; then"} echo " --key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}" \ >> /.luksopen_args - ${optionalString fallback '' + ${optionalString fallbackToPassword '' else echo "keyfile ${keyFile} not found -- fallback to interactive unlocking" fi @@ -332,7 +332,7 @@ in ''; }; - fallback = mkOption { + fallbackToPassword = mkOption { default = false; type = types.bool; description = '' |