X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemctl.c;h=acb89a5a8767719027acaf279dd5d3f47dbd9652;hb=5632e3743db350a67478acc107d76cdf648a1f99;hp=3806786949daee05e861889332cbdac0d76cf52f;hpb=45fb0699c45d2e042e04a53e3ea00501e3f65f59;p=elogind.git

diff --git a/src/systemctl.c b/src/systemctl.c
index 380678694..acb89a5a8 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -188,7 +188,8 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) {
 
         dbus_message_iter_recurse(&iter, &sub);
 
-        printf("%-45s %-6s %-12s %-12s %-15s %s\n", "UNIT", "LOAD", "ACTIVE", "SUB", "JOB", "DESCRIPTION");
+        if (isatty(STDOUT_FILENO))
+                printf("%-45s %-6s %-12s %-12s %-15s %s\n", "UNIT", "LOAD", "ACTIVE", "SUB", "JOB", "DESCRIPTION");
 
         while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
                 const char *id, *description, *load_state, *active_state, *sub_state, *unit_path, *job_type, *job_path, *dot;
@@ -249,15 +250,18 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) {
                 dbus_message_iter_next(&sub);
         }
 
-        printf("\nLOAD   = Load State, reflects whether the unit configuration was properly loaded.\n"
-               "ACTIVE = Active State, the high-level unit activation state, i.e. generalization of the substate.\n"
-               "SUB    = Substate, the low-level unit activation state, possible values depend on unit type.\n"
-               "JOB    = Job, shows scheduled jobs for the unit.\n");
+        if (isatty(STDOUT_FILENO)) {
 
-        if (arg_all)
-                printf("\n%u units listed.\n", k);
-        else
-                printf("\n%u units listed. Pass --all to see inactive units, too.\n", k);
+                printf("\nLOAD   = Load State, reflects whether the unit configuration was properly loaded.\n"
+                       "ACTIVE = Active State, the high-level unit activation state, i.e. generalization of the substate.\n"
+                       "SUB    = Substate, the low-level unit activation state, possible values depend on unit type.\n"
+                       "JOB    = Job, shows pending jobs for the unit.\n");
+
+                if (arg_all)
+                        printf("\n%u units listed.\n", k);
+                else
+                        printf("\n%u units listed. Pass --all to see inactive units, too.\n", k);
+        }
 
         r = 0;
 
@@ -2635,10 +2639,11 @@ static int clear_jobs(DBusConnection *bus, char **args, unsigned n) {
                 assert(arg_action == ACTION_SYSTEMCTL);
 
                 method =
-                        streq(args[0], "clear-jobs")    ? "ClearJobs" :
-                        streq(args[0], "daemon-reload") ? "Reload" :
-                        streq(args[0], "daemon-reexec") ? "Reexecute" :
-                                                          "Exit";
+                        streq(args[0], "clear-jobs")        ? "ClearJobs" :
+                        streq(args[0], "daemon-reload")     ? "Reload" :
+                        streq(args[0], "daemon-reexec")     ? "Reexecute" :
+                        streq(args[0], "reset-maintenance") ? "ResetMaintenance" :
+                                                              "Exit";
         }
 
         if (!(m = dbus_message_new_method_call(
@@ -2678,6 +2683,63 @@ finish:
         return r;
 }
 
+static int reset_maintenance(DBusConnection *bus, char **args, unsigned n) {
+        DBusMessage *m = NULL, *reply = NULL;
+        unsigned i;
+        int r;
+        DBusError error;
+
+        assert(bus);
+        dbus_error_init(&error);
+
+        if (n <= 1)
+                return clear_jobs(bus, args, n);
+
+        for (i = 1; i < n; i++) {
+
+                if (!(m = dbus_message_new_method_call(
+                                      "org.freedesktop.systemd1",
+                                      "/org/freedesktop/systemd1",
+                                      "org.freedesktop.systemd1.Manager",
+                                      "ResetMaintenanceUnit"))) {
+                        log_error("Could not allocate message.");
+                        r = -ENOMEM;
+                        goto finish;
+                }
+
+                if (!dbus_message_append_args(m,
+                                              DBUS_TYPE_STRING, args + i,
+                                              DBUS_TYPE_INVALID)) {
+                        log_error("Could not append arguments to message.");
+                        r = -ENOMEM;
+                        goto finish;
+                }
+
+                if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
+                        log_error("Failed to issue method call: %s", error.message);
+                        r = -EIO;
+                        goto finish;
+                }
+
+                dbus_message_unref(m);
+                dbus_message_unref(reply);
+                m = reply = NULL;
+        }
+
+        r = 0;
+
+finish:
+        if (m)
+                dbus_message_unref(m);
+
+        if (reply)
+                dbus_message_unref(reply);
+
+        dbus_error_free(&error);
+
+        return r;
+}
+
 static int show_enviroment(DBusConnection *bus, char **args, unsigned n) {
         DBusMessage *m = NULL, *reply = NULL;
         DBusError error;
@@ -2828,7 +2890,7 @@ finish:
 static int systemctl_help(void) {
 
         printf("%s [OPTIONS...] {COMMAND} ...\n\n"
-               "Send control commands to the systemd manager.\n\n"
+               "Send control commands to or query the systemd manager.\n\n"
                "  -h --help          Show this help\n"
                "  -t --type=TYPE     List only units of a particular type\n"
                "  -p --property=NAME Show only properties by this name\n"
@@ -2858,6 +2920,8 @@ static int systemctl_help(void) {
                "  status [NAME...]                Show status of one or more units\n"
                "  show [NAME...|JOB...]           Show properties of one or more\n"
                "                                  units/jobs/manager\n"
+               "  reset-maintenance [NAME...]     Reset maintenance state for all, one\n"
+               "                                  or more units\n"
                "  load [NAME...]                  Load one or more units\n"
                "  list-jobs                       List jobs\n"
                "  cancel [JOB...]                 Cancel one or more jobs\n"
@@ -3575,6 +3639,7 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[]) {
                 { "default",           EQUAL, 1, start_special   },
                 { "rescue",            EQUAL, 1, start_special   },
                 { "emergency",         EQUAL, 1, start_special   },
+                { "reset-maintenance", MORE,  1, reset_maintenance },
         };
 
         int left;