Unverified Commit e520c2e2 authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

Merge pull request #240600 from lilyinstarlight/fix/luksroot-lvm-default-off 

nixos/lvm: toggle initrd enable option independently of main options
parents d2e03ddd 7b514d21

nixos/modules/tasks/lvm.nix

+5 −4
Original line number Diff line number Diff line
@@ -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" ];