X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Fuser-sessions.c;h=6edb823e8c5775f8871c94335d8e4808ecc22a71;hb=0fa9e53d12a64981e071e0adb24698f4735e2599;hp=df46b76c872842597597e1661da4b7e29ec1a329;hpb=927f62bd54ee1c70b1c855b7def84169b950b5d0;p=elogind.git

diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c
index df46b76c8..6edb823e8 100644
--- a/src/login/user-sessions.c
+++ b/src/login/user-sessions.c
@@ -6,16 +6,16 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
@@ -25,76 +25,57 @@
 
 #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.");
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+        log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
         log_open();
 
         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");
+                        log_error_errno(errno, "Failed to remove /run/nologin file: %m");
                         r = -errno;
                 }
 
                 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
                          * exist), don't complain */
 
                         if (errno != EROFS || access("/etc/nologin", F_OK) >= 0) {
-                                log_error("Failed to remove /etc/nologin file: %m");
-                                q = -errno;
+                                log_error_errno(errno, "Failed to remove /etc/nologin file: %m");
+                                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;
-
-                if ((r = write_one_line_file_atomic("/run/nologin", "System is going down.")) < 0)
-                        log_error("Failed to create /run/nologin: %s", strerror(-r));
-
-                if ((q = cg_get_user_path(&cgroup_user_tree)) < 0) {
-                        log_error("Failed to determine use path: %s", strerror(-q));
-                        goto finish;
-                }
+                int r;
 
-                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;
+                r = write_string_file_atomic("/run/nologin", "System is going down.");
+                if (r < 0) {
+                        log_error_errno(r, "Failed to create /run/nologin: %m");
+                        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;
 }