summary refs log tree commit diff
path: root/nixos/tests/installer.nix
diff options
context:
space:
mode:
authorAnders Kaseorg <andersk@mit.edu>2020-09-03 04:51:36 -0700
committerAnders Kaseorg <andersk@mit.edu>2020-09-03 12:35:56 -0700
commitf4b2c9dfe7cb63edc8059c6caeaa9de015068628 (patch)
tree9bb3dc60c91976c2a6fb993a217b6659f86f20d1 /nixos/tests/installer.nix
parent02a2649220887363e7730cfb2f0dcc3c4cf17f06 (diff)
downloadnixpkgs-f4b2c9dfe7cb63edc8059c6caeaa9de015068628.tar
nixpkgs-f4b2c9dfe7cb63edc8059c6caeaa9de015068628.tar.gz
nixpkgs-f4b2c9dfe7cb63edc8059c6caeaa9de015068628.tar.bz2
nixpkgs-f4b2c9dfe7cb63edc8059c6caeaa9de015068628.tar.lz
nixpkgs-f4b2c9dfe7cb63edc8059c6caeaa9de015068628.tar.xz
nixpkgs-f4b2c9dfe7cb63edc8059c6caeaa9de015068628.tar.zst
nixpkgs-f4b2c9dfe7cb63edc8059c6caeaa9de015068628.zip
cryptsetup, lvm2, systemd: Break cyclic dependency at a different point
The cyclic dependency of systemd → cryptsetup → lvm2 → udev=systemd
needs to be broken somewhere.  The previous strategy of building
cryptsetup with an lvm2 built without udev (#66856) caused the
installer.luksroot test to fail.  Instead, build lvm2 with a udev built
without cryptsetup.

Fixes #96479.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'nixos/tests/installer.nix')
-rw-r--r--nixos/tests/installer.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index f64e4101d45..bd1bf733153 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -317,7 +317,6 @@ let
             texinfo
             unionfs-fuse
             xorg.lndir
-            (lvm2.override { udev = null; }) # for initrd (extra-utils)
 
             # add curl so that rather than seeing the test attempt to download
             # curl's tarball, we see what it's trying to download