Merge master into staging

2018-04-09 15:12:32 +02:00
parent 2cf343fc96 2ab846211c
commit 0aa59a08d6
165 changed files with 3784 additions and 2183 deletions
@@ -386,7 +386,7 @@ let
          ${optionalString (cfg.enableGnomeKeyring)
              "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}
          ${optionalString (config.virtualisation.lxc.lxcfs.enable)
-               "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"}
+               "session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all"}
        '');
    };