diff options
| author | Florian Klink <flokli@flokli.de> | 2020-09-04 19:12:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 19:12:53 +0200 |
| commit | 176d5e090a42961e5c6df3e20e483606f78042e1 (patch) | |
| tree | f6f4889d46eb69c1a17bb20450fd3ac595f076ba /nixos | |
| parent | 7ecabdc22ba3fed533067292bcabbd7ebb07e5d8 (diff) | |
| parent | f4b2c9dfe7cb63edc8059c6caeaa9de015068628 (diff) | |
| download | nixpkgs-176d5e090a42961e5c6df3e20e483606f78042e1.tar nixpkgs-176d5e090a42961e5c6df3e20e483606f78042e1.tar.gz nixpkgs-176d5e090a42961e5c6df3e20e483606f78042e1.tar.bz2 nixpkgs-176d5e090a42961e5c6df3e20e483606f78042e1.tar.lz nixpkgs-176d5e090a42961e5c6df3e20e483606f78042e1.tar.xz nixpkgs-176d5e090a42961e5c6df3e20e483606f78042e1.tar.zst nixpkgs-176d5e090a42961e5c6df3e20e483606f78042e1.zip | |
Merge pull request #97008 from andersk/cryptception-1
cryptsetup, lvm2, systemd: Break cyclic dependency at a different point
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 8 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 1b2f22a039c..6823e12847c 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -87,9 +87,7 @@ let # copy what we need. Instead of using statically linked binaries, # we just copy what we need from Glibc and use patchelf to make it # work. - extraUtils = let - # Use lvm2 without udev support, which is the same lvm2 we already have in the closure anyways - lvm2 = pkgs.lvm2.override { udev = null; }; in pkgs.runCommandCC "extra-utils" + extraUtils = pkgs.runCommandCC "extra-utils" { nativeBuildInputs = [pkgs.buildPackages.nukeReferences]; allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd } @@ -113,8 +111,8 @@ let copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid # Copy dmsetup and lvm. - copy_bin_and_libs ${getBin lvm2}/bin/dmsetup - copy_bin_and_libs ${getBin lvm2}/bin/lvm + copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup + copy_bin_and_libs ${getBin pkgs.lvm2}/bin/lvm # Add RAID mdadm tool. copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm 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 |