Unverified Commit b9a6c05f authored by rorosen's avatar rorosen Committed by GitHub
Browse files

nixos/lvm: add option for adding lvresize_fs_helper to config (#503040)

parents 288fe65c b2abc2a2

nixos/modules/profiles/bashless.nix

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
  users.manageLingering = lib.mkDefault false;

  # Relies on the gzip command which depends on bash

  services.logrotate.enable = lib.mkDefault false;

  # The resize helper pulls in bash

  services.lvm.resizeHelper.enable = false;



  # Check that the system does not contain a Nix store path that contains the

  # string "bash".

nixos/modules/tasks/lvm.nix

+5 −1
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ in 
      '';

    };



    resizeHelper.enable = mkEnableOption "lvresize_fs_helper" // {

      default = true;

    };



    package = mkOption {

      type = types.package;

      default = pkgs.lvm2;
@@ -60,7 +64,7 @@ in 


      services.udev.packages = [ cfg.package.out ];

      environment.etc."lvm/lvm.conf".text =

        "global/lvresize_fs_helper_executable = ${pkgs.lvm2.scripts}/libexec/lvresize_fs_helper";

        mkIf cfg.resizeHelper.enable "global/lvresize_fs_helper_executable = ${pkgs.lvm2.scripts}/libexec/lvresize_fs_helper";

    })

    (mkIf config.boot.initrd.services.lvm.enable {

      # We need lvm2 for the device-mapper rules