archrelease: copy trunk to extra-x86_64
[arch-packages.git] / slim / trunk / slim-1.3.6-systemd-session.patch
blobbe5f529829b3326faafe28efb094173fc35eab73
1 --- a/app.cpp 2013-10-23 16:19:57.074100282 -0400
2 +++ b/app.cpp 2013-10-23 16:33:13.302122574 -0400
3 @@ -829,8 +829,13 @@
5 StopServer();
6 RemoveLock();
7 - while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
8 - Run();
9 + if (force_nodaemon) {
10 + delete LoginPanel;
11 + exit(ERR_EXIT); /* use ERR_EXIT so that systemd's RESTART=on-failure works */
12 + } else {
13 + while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
14 + Run();
15 + }
18 void App::KillAllClients(Bool top) {
19 --- a/slim.service 2013-10-23 16:19:57.074100282 -0400
20 +++ b/slim.service 2013-10-23 16:45:14.901142776 -0400
21 @@ -4,6 +4,7 @@
23 [Service]
24 ExecStart=/usr/bin/slim -nodaemon
25 +Restart=on-failure
27 [Install]
28 Alias=display-manager.service
29 Common subdirectories: slim-1.3.6/themes and slim-1.3.6.new/themes