X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemctl.c;h=bdfd0cdf87f52ac7e599727d94d6597e9a6b96d1;hb=36adffeab07c74470bc96417b17a72b53055ee42;hp=3806786949daee05e861889332cbdac0d76cf52f;hpb=45fb0699c45d2e042e04a53e3ea00501e3f65f59;p=elogind.git diff --git a/src/systemctl.c b/src/systemctl.c index 380678694..bdfd0cdf8 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -58,6 +58,7 @@ static bool arg_no_sync = false; static bool arg_no_wall = false; static bool arg_dry = false; static bool arg_quiet = false; +static char arg_full = false; static char **arg_wall = NULL; static enum action { ACTION_INVALID, @@ -188,10 +189,11 @@ 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; + const char *id, *description, *load_state, *active_state, *sub_state, *following, *unit_path, *job_type, *job_path, *dot; uint32_t job_id; if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) { @@ -207,6 +209,7 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) { bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &load_state, true) < 0 || bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &active_state, true) < 0 || bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &sub_state, true) < 0 || + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &following, true) < 0 || bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &unit_path, true) < 0 || bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &job_id, true) < 0 || bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &job_type, true) < 0 || @@ -218,14 +221,16 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) { if ((!arg_type || ((dot = strrchr(id, '.')) && streq(dot+1, arg_type))) && - (arg_all || !streq(active_state, "inactive") || job_id > 0)) { - + (arg_all || !(streq(active_state, "inactive") || following[0]) || job_id > 0)) { + char *e; int a = 0, b = 0; if (streq(active_state, "maintenance")) fputs(ANSI_HIGHLIGHT_ON, stdout); - printf("%-45s %-6s %-12s %-12s%n", id, load_state, active_state, sub_state, &a); + e = arg_full ? NULL : ellipsize(id, 45, 33); + printf("%-45s %-6s %-12s %-12s%n", e ? e : id, load_state, active_state, sub_state, &a); + free(e); if (job_id != 0) printf(" => %-12s%n", job_type, &b); @@ -249,15 +254,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; @@ -554,6 +562,7 @@ static int list_jobs(DBusConnection *bus, char **args, unsigned n) { while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { const char *name, *type, *state, *job_path, *unit_path; uint32_t id; + char *e; if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) { log_error("Failed to parse reply."); @@ -574,7 +583,10 @@ static int list_jobs(DBusConnection *bus, char **args, unsigned n) { goto finish; } - printf("%4u %-45s %-17s %-7s\n", id, name, type, state); + e = arg_full ? NULL : ellipsize(name, 45, 33); + printf("%4u %-45s %-17s %-7s\n", id, e ? e : name, type, state); + free(e); + k++; dbus_message_iter_next(&sub); @@ -2635,10 +2647,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 +2691,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,11 +2898,12 @@ 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" " -a --all Show all units/properties, including dead/empty ones\n" + " --full Don't ellipsize unit names.\n" " --fail When installing a new job, fail if conflicting jobs are\n" " pending\n" " --system Connect to system bus\n" @@ -2858,6 +2929,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" @@ -2958,7 +3031,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) { ARG_NO_BLOCK, ARG_NO_WALL, ARG_ORDER, - ARG_REQUIRE + ARG_REQUIRE, + ARG_FULL }; static const struct option options[] = { @@ -2966,6 +3040,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { { "type", required_argument, NULL, 't' }, { "property", required_argument, NULL, 'p' }, { "all", no_argument, NULL, 'a' }, + { "full", no_argument, NULL, ARG_FULL }, { "fail", no_argument, NULL, ARG_FAIL }, { "session", no_argument, NULL, ARG_SESSION }, { "system", no_argument, NULL, ARG_SYSTEM }, @@ -3035,6 +3110,10 @@ static int systemctl_parse_argv(int argc, char *argv[]) { arg_dot = DOT_REQUIRE; break; + case ARG_FULL: + arg_full = true; + break; + case 'q': arg_quiet = true; break; @@ -3575,6 +3654,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;