mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge staging-next into staging
This commit is contained in:
commit
b4832bac52
95 changed files with 1458 additions and 594 deletions
|
@ -145,6 +145,10 @@ in {
|
|||
{ # Ensure that pam_systemd gets included. This is special-cased
|
||||
# in systemd to provide XDG_RUNTIME_DIR.
|
||||
startSession = true;
|
||||
# Disable pam_mount in systemd-user to prevent it from being called
|
||||
# multiple times during login, because it will prevent pam_mount from
|
||||
# unmounting the previously mounted volumes.
|
||||
pamMount = false;
|
||||
};
|
||||
|
||||
# Some overrides to upstream units.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue