diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 18:15:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 18:15:13 +0100 |
| commit | 4cc2a38854338ba783fb867ff924200b59867773 (patch) | |
| tree | 5b6c24becb12735ccb81edcb3fdfdd685e582d3d /nixos | |
| parent | e576535408530584d3590ecbead71d30dbfcfb07 (diff) | |
| parent | f448a79770db137448f12236fc10719ef7389abd (diff) | |
| download | nixpkgs-4cc2a38854338ba783fb867ff924200b59867773.tar nixpkgs-4cc2a38854338ba783fb867ff924200b59867773.tar.gz nixpkgs-4cc2a38854338ba783fb867ff924200b59867773.tar.bz2 nixpkgs-4cc2a38854338ba783fb867ff924200b59867773.tar.lz nixpkgs-4cc2a38854338ba783fb867ff924200b59867773.tar.xz nixpkgs-4cc2a38854338ba783fb867ff924200b59867773.tar.zst nixpkgs-4cc2a38854338ba783fb867ff924200b59867773.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/security/pam.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/lxcfs.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index bf7f62c5da9..8d658a20a1f 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -351,6 +351,8 @@ let ${optionalString (cfg.enableKwallet) ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + ${optionalString (config.virtualisation.lxc.lxcfs.enable) + "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"} ''); }; diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix index 48462dc66da..b2457403463 100644 --- a/nixos/modules/virtualisation/lxcfs.nix +++ b/nixos/modules/virtualisation/lxcfs.nix @@ -28,13 +28,9 @@ in { ###### implementation config = mkIf cfg.enable { - services.cgmanager.enable = true; - systemd.services.lxcfs = { description = "FUSE filesystem for LXC"; wantedBy = [ "multi-user.target" ]; - requires = [ "cgmanager.service" ]; - after = [ "cgmanager.service" ]; before = [ "lxc.service" ]; restartIfChanged = false; serviceConfig = { |