systemctl: don't actually reboot/poweroff/halt if only a wtmp update is requested

[elogind.git] / src / systemctl.c

diff --git a/src/systemctl.c b/src/systemctl.c
index 75d98c67cde7d9ee6de29c614543aeccd1e8d0d9..01deafe2a13b1d0edc3bcfe8633343ccc1eab471 100644 (file)
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -42,6 +42,7 @@
 #include "initreq.h"
 #include "strv.h"
 #include "dbus-common.h"
+#include "cgroup-show.h"
 
 static const char *arg_type = NULL;
 static const char *arg_property = NULL;
@@ -109,31 +110,6 @@ static int bus_iter_get_basic_and_next(DBusMessageIter *iter, int type, void *da
         return 0;
 }
 
-static int columns(void) {
-        static int parsed_columns = 0;
-        const char *e;
-
-        if (parsed_columns > 0)
-                return parsed_columns;
-
-        if ((e = getenv("COLUMNS")))
-                parsed_columns = atoi(e);
-
-        if (parsed_columns <= 0) {
-                struct winsize ws;
-                zero(ws);
-
-                if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) >= 0)
-                        parsed_columns = ws.ws_col;
-        }
-
-        if (parsed_columns <= 0)
-                parsed_columns = 80;
-
-        return parsed_columns;
-
-}
-
 static void warn_wall(enum action action) {
         static const char *table[_ACTION_MAX] = {
                 [ACTION_HALT]      = "The system is going down for system halt NOW!",
@@ -946,53 +922,6 @@ finish:
         return r;
 }
 
-static void show_cgroup(const char *name) {
-        char *fn;
-        FILE *f;
-        pid_t last = 0;
-
-        if (!startswith(name, "name=systemd:"))
-                return;
-
-        if (asprintf(&fn, "/cgroup/systemd/%s/tasks", name + 13) < 0)
-                return;
-
-        f = fopen(fn, "r");
-        free(fn);
-
-        if (!f)
-                return;
-
-        while (!feof(f)) {
-                unsigned long ul;
-
-                if (fscanf(f, "%lu", &ul) != 1)
-                        break;
-
-                if (ul <= 0)
-                        continue;
-
-                if (last > 0) {
-                        char *t = NULL;
-                        get_process_cmdline(last, 60, &t);
-                        printf("\t\t  \342\224\234 %lu %s\n", (unsigned long) last, strna(t));
-                        free(t);
-                } else
-                        printf("\t\t  \342\224\202\n");
-
-                last = (pid_t) ul;
-        }
-
-        if (last > 0) {
-                char *t = NULL;
-                get_process_cmdline(last, 60, &t);
-                printf("\t\t  \342\224\224 %lu %s\n", (unsigned long) last, strna(t));
-                free(t);
-        }
-
-        fclose(f);
-}
-
 typedef struct UnitStatusInfo {
         const char *id;
         const char *load_state;
@@ -1114,8 +1043,16 @@ static void print_status_info(UnitStatusInfo *i) {
         }
 
         if (i->default_control_group) {
+                unsigned c;
+
                 printf("\t  CGroup: %s\n", i->default_control_group);
-                show_cgroup(i->default_control_group);
+
+                if ((c = columns()) > 18)
+                        c -= 18;
+                else
+                        c = 0;
+
+                show_cgroup_recursive(i->default_control_group, "\t\t  ", c);
         }
 }
 
@@ -3107,7 +3044,7 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[]) {
                 { "reboot",            EQUAL, 1, start_special   },
                 { "default",           EQUAL, 1, start_special   },
                 { "rescue",            EQUAL, 1, start_special   },
-                { "emergency",         EQUAL, 1, start_special   },
+                { "emergency",         EQUAL, 1, start_special   }
         };
 
         int left;
@@ -3219,7 +3156,7 @@ static int start_with_fallback(DBusConnection *bus) {
 static int halt_main(DBusConnection *bus) {
         int r;
 
-        if (!arg_immediate)
+        if (!arg_dry && !arg_immediate)
                 return start_with_fallback(bus);
 
         if (!arg_no_wtmp)