diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2023-07-05 12:42:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-05 12:42:45 -0400 |
| commit | e520c2e2788cc73e7fe1901c257a633293f27ffb (patch) | |
| tree | d7a4fda9e2fcfe64b7c0b20219aeb980b2c8386f /nixos/modules/tasks | |
| parent | d2e03dddbba1bd8cf31f2e4985a946fb2fa5717c (diff) | |
| parent | 7b514d217583079a782855c852c6dda62fcbd4cd (diff) | |
| download | nixpkgs-e520c2e2788cc73e7fe1901c257a633293f27ffb.tar nixpkgs-e520c2e2788cc73e7fe1901c257a633293f27ffb.tar.gz nixpkgs-e520c2e2788cc73e7fe1901c257a633293f27ffb.tar.bz2 nixpkgs-e520c2e2788cc73e7fe1901c257a633293f27ffb.tar.lz nixpkgs-e520c2e2788cc73e7fe1901c257a633293f27ffb.tar.xz nixpkgs-e520c2e2788cc73e7fe1901c257a633293f27ffb.tar.zst nixpkgs-e520c2e2788cc73e7fe1901c257a633293f27ffb.zip | |
Merge pull request #240600 from lilyinstarlight/fix/luksroot-lvm-default-off
nixos/lvm: toggle initrd enable option independently of main options
Diffstat (limited to 'nixos/modules/tasks')
| -rw-r--r-- | nixos/modules/tasks/lvm.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix index 4bf960a93d9..325a5aa45b1 100644 --- a/nixos/modules/tasks/lvm.nix +++ b/nixos/modules/tasks/lvm.nix @@ -44,12 +44,13 @@ in { systemd.packages = [ cfg.package ]; services.udev.packages = [ cfg.package.out ]; - + }) + (mkIf config.boot.initrd.services.lvm.enable { # We need lvm2 for the device-mapper rules - boot.initrd.services.udev.packages = lib.mkIf config.boot.initrd.services.lvm.enable [ cfg.package ]; + boot.initrd.services.udev.packages = [ cfg.package ]; # The device-mapper rules want to call tools from lvm2 - boot.initrd.systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ cfg.package ]; - boot.initrd.services.udev.binPackages = lib.mkIf config.boot.initrd.services.lvm.enable [ cfg.package ]; + boot.initrd.systemd.initrdBin = [ cfg.package ]; + boot.initrd.services.udev.binPackages = [ cfg.package ]; }) (mkIf cfg.dmeventd.enable { systemd.sockets."dm-event".wantedBy = [ "sockets.target" ]; |