Unverified Commit f92201f4 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #197925 from SuperSandro2000/lvm2

parents 2090e6b6 5452a260

nixos/modules/tasks/lvm.nix

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

nixos/modules/virtualisation/container-config.nix

+3 −0
Original line number Diff line number Diff line
@@ -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";