diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2019-12-10 02:51:19 +0100 |
|---|---|---|
| committer | Silvan Mosberger <contact@infinisil.com> | 2019-12-10 02:51:19 +0100 |
| commit | 4ee3e8b21dfeaf236b86a0c109953dd809a77e64 (patch) | |
| tree | 79bf61d3635aa336cd88d215470be66f489cc267 /nixos/modules/system/boot/luksroot.nix | |
| parent | cd9ace689274fedd7e95dabdc99041d4c799c3dc (diff) | |
| download | nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.gz nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.bz2 nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.lz nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.xz nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.zst nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.zip | |
nixos/treewide: Move rename.nix imports to their respective modules
A centralized list for these renames is not good because: - It breaks disabledModules for modules that have a rename defined - Adding/removing renames for a module means having to find them in the central file - Merge conflicts due to multiple people editing the central file
Diffstat (limited to 'nixos/modules/system/boot/luksroot.nix')
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index a4029d766b0..0bb8396a44f 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -126,7 +126,7 @@ let gpg-agent --daemon --scdaemon-program $out/bin/scdaemon > /dev/null 2> /dev/null ''} - + # Disable all input echo for the whole stage. We could use read -s # instead but that would ocasionally leak characters between read # invocations. @@ -417,6 +417,9 @@ let in { + imports = [ + (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") + ]; options = { |