diff options
| author | Lily Foster <lily@lily.flowers> | 2023-07-05 04:59:04 -0400 |
|---|---|---|
| committer | Lily Foster <lily@lily.flowers> | 2023-07-05 04:59:04 -0400 |
| commit | 7b514d217583079a782855c852c6dda62fcbd4cd (patch) | |
| tree | c87939b1a46f5f62c7cca2bbb09ea0def7c69c45 | |
| parent | 46e3229c8daf402f70a698298585a380ec2e18ca (diff) | |
| download | nixpkgs-7b514d217583079a782855c852c6dda62fcbd4cd.tar nixpkgs-7b514d217583079a782855c852c6dda62fcbd4cd.tar.gz nixpkgs-7b514d217583079a782855c852c6dda62fcbd4cd.tar.bz2 nixpkgs-7b514d217583079a782855c852c6dda62fcbd4cd.tar.lz nixpkgs-7b514d217583079a782855c852c6dda62fcbd4cd.tar.xz nixpkgs-7b514d217583079a782855c852c6dda62fcbd4cd.tar.zst nixpkgs-7b514d217583079a782855c852c6dda62fcbd4cd.zip | |
nixos/lvm: toggle initrd enable option independently of main options
| -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 a14f26c02e4..26e27f53f61 100644 --- a/nixos/modules/tasks/lvm.nix +++ b/nixos/modules/tasks/lvm.nix @@ -40,12 +40,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" ]; |