Unverified Commit 426bad28 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #284020 from adamcstephens/pam_cgfs 

nixos/pam: remove pam_cgfs
parents c3ecae9f 75ec325c

nixos/modules/security/pam.nix

+0 −3
Original line number Diff line number Diff line
@@ -867,9 +867,6 @@ let 
          { name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = {

            no-autostart = cfg.gnupg.noAutostart;

          }; }

          { name = "cgfs"; enable = config.virtualisation.lxc.lxcfs.enable; control = "optional"; modulePath = "${pkgs.lxc}/lib/security/pam_cgfs.so"; args = [

            "-c" "all"

          ]; }

        ];

      };

    };

pkgs/os-specific/linux/lxc/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
  nix-update-script,

  nixosTests,

  openssl,

  pam,

  pkg-config,

  systemd,

}:
@@ -41,7 +40,6 @@ stdenv.mkDerivation rec { 
    libseccomp

    libselinux

    openssl

    pam

    systemd

  ];