X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Fuser-sessions.c;h=ca5de41f40277113244fc118f60e0e703b780999;hp=c6f8fa79e2ddb649b923e352a7eaadedb7f49a90;hb=fe5af61253ab8531c6d683da77546fe97be69b38;hpb=a5c32cff1f56afe6f0c6c70d91a88a7a8238b2d7

diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c
index c6f8fa79e..ca5de41f4 100644
--- a/src/login/user-sessions.c
+++ b/src/login/user-sessions.c
@@ -25,11 +25,9 @@
 
 #include "log.h"
 #include "util.h"
-#include "cgroup-util.h"
 #include "fileio.h"
 
 int main(int argc, char*argv[]) {
-        int ret = EXIT_FAILURE;
 
         if (argc != 2) {
                 log_error("This program requires one argument.");
@@ -43,7 +41,7 @@ int main(int argc, char*argv[]) {
         umask(0022);
 
         if (streq(argv[1], "start")) {
-                int q = 0, r = 0;
+                int r = 0;
 
                 if (unlink("/run/nologin") < 0 && errno != ENOENT) {
                         log_error("Failed to remove /run/nologin file: %m");
@@ -51,7 +49,6 @@ int main(int argc, char*argv[]) {
                 }
 
                 if (unlink("/etc/nologin") < 0 && errno != ENOENT) {
-
                         /* If the file doesn't exist and /etc simply
                          * was read-only (in which case unlink()
                          * returns EROFS even if the file doesn't
@@ -59,44 +56,26 @@ int main(int argc, char*argv[]) {
 
                         if (errno != EROFS || access("/etc/nologin", F_OK) >= 0) {
                                 log_error("Failed to remove /etc/nologin file: %m");
-                                q = -errno;
+                                return EXIT_FAILURE;
                         }
                 }
 
-                if (r < 0 || q < 0)
-                        goto finish;
+                if (r < 0)
+                        return EXIT_FAILURE;
 
         } else if (streq(argv[1], "stop")) {
-                int r, q;
-                char *cgroup_user_tree = NULL;
+                int r;
 
-                r = write_one_line_file_atomic("/run/nologin", "System is going down.");
-                if (r < 0)
+                r = write_string_file_atomic("/run/nologin", "System is going down.");
+                if (r < 0) {
                         log_error("Failed to create /run/nologin: %s", strerror(-r));
-
-                q = cg_get_user_path(&cgroup_user_tree);
-                if (q < 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;
+                        return EXIT_FAILURE;
                 }
 
-                if (r < 0)
-                        goto finish;
-
         } else {
                 log_error("Unknown verb %s.", argv[1]);
-                goto finish;
+                return EXIT_FAILURE;
         }
 
-        ret = EXIT_SUCCESS;
-
-finish:
-        return ret;
+        return EXIT_SUCCESS;
 }