Merge pull request #197925 from SuperSandro2000/lvm2

authored by

Sandro and committed by
GitHub
f92201f4 2090e6b6

+8 -1
+5 -1
nixos/modules/tasks/lvm.nix
··· 5 5 cfg = config.services.lvm; 6 6 in { 7 7 options.services.lvm = { 8 + enable = mkEnableOption (lib.mdDoc "lvm2") // { 9 + default = true; 10 + }; 11 + 8 12 package = mkOption { 9 13 type = types.package; 10 14 default = pkgs.lvm2; ··· 30 34 # minimal configuration file to make lvmconfig/lvm2-activation-generator happy 31 35 environment.etc."lvm/lvm.conf".text = "config {}"; 32 36 }) 33 - (mkIf (!config.boot.isContainer) { 37 + (mkIf cfg.enable { 34 38 systemd.tmpfiles.packages = [ cfg.package.out ]; 35 39 environment.systemPackages = [ cfg.package ]; 36 40 systemd.packages = [ cfg.package ];
+3
nixos/modules/virtualisation/container-config.nix
··· 24 24 # containers do not need to setup devices 25 25 services.udev.enable = false; 26 26 27 + # containers normally do not need to manage logical volumes 28 + services.lvm.enable = lib.mkDefault false; 29 + 27 30 # Shut up warnings about not having a boot loader. 28 31 system.build.installBootLoader = lib.mkDefault "${pkgs.coreutils}/bin/true"; 29 32