mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 14:41:17 +00:00
873662b8ad
Previously logging in via SLiM more than once didn't work because SLiM doesn't clean up its PAM session properly (that is, in a child rather than in the parent). Thus the slim process becomes part of the user session's cgroup, among other things. This patch causes SLiM to exit after the session has finished, after which systemd will restart display-manager.service. Fixes NixOS/nixops#137.
13 lines
380 B
Diff
13 lines
380 B
Diff
diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
|
|
--- slim-1.3.6-orig/app.cpp 2013-10-15 11:02:55.629263422 +0200
|
|
+++ slim-1.3.6/app.cpp 2013-10-15 13:00:10.141210784 +0200
|
|
@@ -816,7 +822,7 @@
|
|
StopServer();
|
|
RemoveLock();
|
|
while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
|
|
- Run();
|
|
+ exit(OK_EXIT);
|
|
}
|
|
|
|
void App::KillAllClients(Bool top) {
|