diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-11-24 13:58:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-24 13:58:29 +0100 |
| commit | f92201f46109aabbbf41b8dc24bb9d342eb93a35 (patch) | |
| tree | 122c9547113efdcf4152c3cc87f49d26d6fbe4ad /nixos | |
| parent | 2090e6b6f25336c94fbddf465ca5c699affdfcbf (diff) | |
| parent | 5452a260774ac78d71232896aa69734ed1e9607a (diff) | |
| download | nixlib-f92201f46109aabbbf41b8dc24bb9d342eb93a35.tar nixlib-f92201f46109aabbbf41b8dc24bb9d342eb93a35.tar.gz nixlib-f92201f46109aabbbf41b8dc24bb9d342eb93a35.tar.bz2 nixlib-f92201f46109aabbbf41b8dc24bb9d342eb93a35.tar.lz nixlib-f92201f46109aabbbf41b8dc24bb9d342eb93a35.tar.xz nixlib-f92201f46109aabbbf41b8dc24bb9d342eb93a35.tar.zst nixlib-f92201f46109aabbbf41b8dc24bb9d342eb93a35.zip | |
Merge pull request #197925 from SuperSandro2000/lvm2
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/tasks/lvm.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/container-config.nix | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix index 760133fafa29..a14f26c02e48 100644 --- a/nixos/modules/tasks/lvm.nix +++ b/nixos/modules/tasks/lvm.nix @@ -5,6 +5,10 @@ let cfg = config.services.lvm; in { options.services.lvm = { + enable = mkEnableOption (lib.mdDoc "lvm2") // { + default = true; + }; + package = mkOption { type = types.package; default = pkgs.lvm2; @@ -30,7 +34,7 @@ in { # minimal configuration file to make lvmconfig/lvm2-activation-generator happy environment.etc."lvm/lvm.conf".text = "config {}"; }) - (mkIf (!config.boot.isContainer) { + (mkIf cfg.enable { systemd.tmpfiles.packages = [ cfg.package.out ]; environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index 09a2d9de040a..177e11f0696b 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -24,6 +24,9 @@ with lib; # containers do not need to setup devices services.udev.enable = false; + # containers normally do not need to manage logical volumes + services.lvm.enable = lib.mkDefault false; + # Shut up warnings about not having a boot loader. system.build.installBootLoader = lib.mkDefault "${pkgs.coreutils}/bin/true"; |