about summary refs log tree commit diff
diff options
context:
space:
mode:
authorobadz <obadz-git@obadz.com>2016-05-26 04:00:58 +0100
committerobadz <obadz-git@obadz.com>2016-05-26 04:02:36 +0100
commite78a99c35b046aeebbae8213321d3181cd908d4f (patch)
tree2aa543138ba32b371c6d833865f7d1889e952030
parentc6b3aca4e277c7ab6d1cdd3f07038a22ac27b06a (diff)
downloadnixlib-e78a99c35b046aeebbae8213321d3181cd908d4f.tar
nixlib-e78a99c35b046aeebbae8213321d3181cd908d4f.tar.gz
nixlib-e78a99c35b046aeebbae8213321d3181cd908d4f.tar.bz2
nixlib-e78a99c35b046aeebbae8213321d3181cd908d4f.tar.lz
nixlib-e78a99c35b046aeebbae8213321d3181cd908d4f.tar.xz
nixlib-e78a99c35b046aeebbae8213321d3181cd908d4f.tar.zst
nixlib-e78a99c35b046aeebbae8213321d3181cd908d4f.zip
nixos/tests/installer.nix: nixos-generate-config detects LUKS since a7baec7
Fixes nix-build '<nixos/release.nix>' -A tests.installer.luksroot.x86_64-linux
-rw-r--r--nixos/tests/installer.nix5
1 files changed, 0 insertions, 5 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 866f98825362..3fdf6510953e 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -360,13 +360,8 @@ in {
           "mount LABEL=boot /mnt/boot",
         );
       '';
-      # XXX: Currently, generate-config doesn't detect LUKS yet.
       extraConfig = ''
         boot.kernelParams = lib.mkAfter [ "console=tty0" ];
-        boot.initrd.luks.devices.cryptroot = {
-          device = "/dev/vda3";
-          preLVM = true;
-        };
       '';
       enableOCR = true;
       preBootCommands = ''