mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #240600 from lilyinstarlight/fix/luksroot-lvm-default-off
nixos/lvm: toggle initrd enable option independently of main options
This commit is contained in:
commit
e520c2e278
|
@ -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" ];
|
||||
|
|
Loading…
Reference in a new issue