X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fuser-sessions.c;h=4518d953ed7bebc80b3f110d2981ee3961391278;hp=8026961560906818a9f2426af484d1ccb5383e22;hb=4466ee6a7151b30b7738b09c4c21ffa3872a5047;hpb=4a8a5b2963fca71fca044dcdddc3f767f3cdbd17

diff --git a/src/user-sessions.c b/src/user-sessions.c
index 802696156..4518d953e 100644
--- a/src/user-sessions.c
+++ b/src/user-sessions.c
@@ -42,8 +42,8 @@ int main(int argc, char*argv[]) {
         if (streq(argv[1], "start")) {
                 int q = 0, r = 0;
 
-                if (unlink("/var/run/nologin") < 0 && errno != ENOENT) {
-                        log_error("Failed to remove /var/run/nologin file: %m");
+                if (unlink("/run/nologin") < 0 && errno != ENOENT) {
+                        log_error("Failed to remove /run/nologin file: %m");
                         r = -errno;
                 }
 
@@ -57,14 +57,25 @@ int main(int argc, char*argv[]) {
 
         } else if (streq(argv[1], "stop")) {
                 int r, q;
+                char *cgroup_user_tree = NULL;
 
-                if ((r = write_one_line_file("/var/run/nologin", "System is going down.")) < 0)
-                        log_error("Failed to create /var/run/nologin: %s", strerror(-r));
+                if ((r = write_one_line_file("/run/nologin", "System is going down.")) < 0)
+                        log_error("Failed to create /run/nologin: %s", strerror(-r));
 
-                if ((q = cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, "/user", true)) < 0)
+                if ((q = cg_get_user_path(&cgroup_user_tree)) < 0) {
+                        log_error("Failed to determine use path: %s", strerror(-q));
+                        goto finish;
+                }
+
+                q = cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, cgroup_user_tree, true);
+                free(cgroup_user_tree);
+
+                if (q < 0) {
                         log_error("Failed to kill sessions: %s", strerror(-q));
+                        goto finish;
+                }
 
-                if (r < 0 || q < 0)
+                if (r < 0)
                         goto finish;
 
         } else {