X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl.c;h=8ef1adda5e3126bc1bc5f820b944c9a39836b21b;hp=1ded936954279755b7f643fc66e6dc49582c1a78;hb=2ee68f721168378a037a112a5400af0b92805432;hpb=0ff3dea70038ca4501ab38ad38ecd67d8eea1e00 diff --git a/src/systemctl.c b/src/systemctl.c index 1ded93695..8ef1adda5 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -45,19 +46,27 @@ #include "cgroup-show.h" #include "cgroup-util.h" #include "list.h" +#include "path-lookup.h" +#include "conf-parser.h" +#include "sd-daemon.h" static const char *arg_type = NULL; -static const char *arg_property = NULL; +static char **arg_property = NULL; static bool arg_all = false; static bool arg_fail = false; static bool arg_session = false; -static bool arg_no_block = false; +static bool arg_global = false; static bool arg_immediate = false; +static bool arg_no_block = false; static bool arg_no_wtmp = false; static bool arg_no_sync = false; static bool arg_no_wall = false; +static bool arg_no_reload = false; static bool arg_dry = false; static bool arg_quiet = false; +static bool arg_full = false; +static bool arg_force = false; +static bool arg_defaults = false; static char **arg_wall = NULL; static enum action { ACTION_INVALID, @@ -85,6 +94,33 @@ static enum dot { static bool private_bus = false; +static int daemon_reload(DBusConnection *bus, char **args, unsigned n); + +static bool on_tty(void) { + static int t = -1; + + if (_unlikely_(t < 0)) + t = isatty(STDOUT_FILENO) > 0; + + return t; +} + +static const char *ansi_highlight(bool b) { + + if (!on_tty()) + return ""; + + return b ? ANSI_HIGHLIGHT_ON : ANSI_HIGHLIGHT_OFF; +} + +static const char *ansi_highlight_green(bool b) { + + if (!on_tty()) + return ""; + + return b ? ANSI_HIGHLIGHT_GREEN_ON : ANSI_HIGHLIGHT_OFF; +} + static bool error_is_no_service(DBusError *error) { assert(error); @@ -188,10 +224,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 +244,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 +256,22 @@ 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; + const char *on, *off; - if (streq(active_state, "maintenance")) - fputs(ANSI_HIGHLIGHT_ON, stdout); + if (streq(active_state, "maintenance")) { + on = ansi_highlight(true); + off = ansi_highlight(false); + } else + on = off = ""; - 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 %s%-12s %-12s%s%n", e ? e : id, load_state, on, active_state, sub_state, off, &a); + free(e); + + a -= strlen(on) + strlen(off); if (job_id != 0) printf(" => %-12s%n", job_type, &b); @@ -239,9 +285,6 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) { printf(" %.*s", columns() - a - b - 2, description); } - if (streq(active_state, "maintenance")) - fputs(ANSI_HIGHLIGHT_OFF, stdout); - fputs("\n", stdout); k++; } @@ -249,15 +292,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; @@ -281,6 +327,7 @@ static int dot_one_property(const char *name, const char *prop, DBusMessageIter "RequisiteOverridable", "[color=\"darkblue\"]", "Wants", "[color=\"darkgrey\"]", "Conflicts", "[color=\"red\"]", + "ConflictedBy", "[color=\"red\"]", "After", "[color=\"green\"]" }; @@ -459,7 +506,7 @@ static int dot(DBusConnection *bus, char **args, unsigned n) { dbus_message_iter_recurse(&iter, &sub); while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { - const char *id, *description, *load_state, *active_state, *sub_state, *unit_path; + const char *id, *description, *load_state, *active_state, *sub_state, *following, *unit_path; if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) { log_error("Failed to parse reply."); @@ -474,6 +521,7 @@ static int dot(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) { log_error("Failed to parse reply."); r = -EIO; @@ -554,6 +602,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 +623,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); @@ -663,6 +715,9 @@ static int cancel_job(DBusConnection *bus, char **args, unsigned n) { assert(bus); assert(args); + if (n <= 1) + return daemon_reload(bus, args, n); + for (i = 1; i < n; i++) { unsigned id; const char *path; @@ -742,6 +797,77 @@ finish: return r; } +static bool need_daemon_reload(DBusConnection *bus, const char *unit) { + DBusMessage *m, *reply; + dbus_bool_t b = FALSE; + DBusMessageIter iter, sub; + const char + *interface = "org.freedesktop.systemd1.Unit", + *property = "NeedDaemonReload", + *path; + + /* We ignore all errors here, since this is used to show a warning only */ + + if (!(m = dbus_message_new_method_call( + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "GetUnit"))) + goto finish; + + if (!dbus_message_append_args(m, + DBUS_TYPE_STRING, &unit, + DBUS_TYPE_INVALID)) + goto finish; + + if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, NULL))) + goto finish; + + if (!dbus_message_get_args(reply, NULL, + DBUS_TYPE_OBJECT_PATH, &path, + DBUS_TYPE_INVALID)) + goto finish; + + dbus_message_unref(m); + if (!(m = dbus_message_new_method_call( + "org.freedesktop.systemd1", + path, + "org.freedesktop.DBus.Properties", + "Get"))) + goto finish; + + if (!dbus_message_append_args(m, + DBUS_TYPE_STRING, &interface, + DBUS_TYPE_STRING, &property, + DBUS_TYPE_INVALID)) { + goto finish; + } + + dbus_message_unref(reply); + if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, NULL))) + goto finish; + + if (!dbus_message_iter_init(reply, &iter) || + dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) + goto finish; + + dbus_message_iter_recurse(&iter, &sub); + + if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_BOOLEAN) + goto finish; + + dbus_message_iter_get_basic(&sub, &b); + +finish: + if (m) + dbus_message_unref(m); + + if (reply) + dbus_message_unref(reply); + + return b; +} + typedef struct WaitData { Set *set; bool failed; @@ -860,6 +986,7 @@ static int start_unit_one( DBusMessage *m = NULL, *reply = NULL; DBusError error; + const char *path; int r; assert(bus); @@ -903,18 +1030,21 @@ static int start_unit_one( goto finish; } + if (!dbus_message_get_args(reply, &error, + DBUS_TYPE_OBJECT_PATH, &path, + DBUS_TYPE_INVALID)) { + log_error("Failed to parse reply: %s", error.message); + r = -EIO; + goto finish; + } + + if (need_daemon_reload(bus, name)) + log_warning("Unit file of created job changed on disk, 'systemctl %s daemon-reload' recommended.", + arg_session ? "--session" : "--system"); + if (!arg_no_block) { - const char *path; char *p; - if (!dbus_message_get_args(reply, &error, - DBUS_TYPE_OBJECT_PATH, &path, - DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", error.message); - r = -EIO; - goto finish; - } - if (!(p = strdup(path))) { log_error("Failed to duplicate path."); r = -ENOMEM; @@ -988,7 +1118,9 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) { streq(args[0], "restart") ? "RestartUnit" : streq(args[0], "try-restart") ? "TryRestartUnit" : streq(args[0], "reload-or-restart") ? "ReloadOrRestartUnit" : - streq(args[0], "reload-or-try-restart") ? "ReloadOrTryRestartUnit" : + streq(args[0], "reload-or-try-restart") || + streq(args[0], "force-reload") || + streq(args[0], "condrestart") ? "ReloadOrTryRestartUnit" : "StartUnit"; mode = @@ -1287,6 +1419,8 @@ typedef struct UnitStatusInfo { const char *fragment_path; const char *default_control_group; + bool need_daemon_reload; + /* Service */ pid_t main_pid; pid_t control_pid; @@ -1317,6 +1451,7 @@ typedef struct UnitStatusInfo { static void print_status_info(UnitStatusInfo *i) { ExecStatusInfo *p; + const char *on, *off, *ss; assert(i); @@ -1333,27 +1468,35 @@ static void print_status_info(UnitStatusInfo *i) { if (i->fragment_path) printf("\t Loaded: %s (%s)\n", strna(i->load_state), i->fragment_path); else if (streq_ptr(i->load_state, "failed")) - printf("\t Loaded: " ANSI_HIGHLIGHT_ON "%s" ANSI_HIGHLIGHT_OFF "\n", strna(i->load_state)); + printf("\t Loaded: %s%s%s\n", + ansi_highlight(true), + strna(i->load_state), + ansi_highlight(false)); else printf("\t Loaded: %s\n", strna(i->load_state)); + ss = streq_ptr(i->active_state, i->sub_state) ? NULL : i->sub_state; + if (streq_ptr(i->active_state, "maintenance")) { - if (streq_ptr(i->active_state, i->sub_state)) - printf("\t Active: " ANSI_HIGHLIGHT_ON "%s" ANSI_HIGHLIGHT_OFF "\n", - strna(i->active_state)); - else - printf("\t Active: " ANSI_HIGHLIGHT_ON "%s (%s)" ANSI_HIGHLIGHT_OFF "\n", - strna(i->active_state), - strna(i->sub_state)); - } else { - if (streq_ptr(i->active_state, i->sub_state)) - printf("\t Active: %s\n", - strna(i->active_state)); - else - printf("\t Active: %s (%s)\n", - strna(i->active_state), - strna(i->sub_state)); - } + on = ansi_highlight(true); + off = ansi_highlight(false); + } else if (streq_ptr(i->active_state, "active") || streq_ptr(i->active_state, "reloading")) { + on = ansi_highlight_green(true); + off = ansi_highlight_green(false); + } else + on = off = ""; + + if (ss) + printf("\t Active: %s%s (%s)%s\n", + on, + strna(i->active_state), + ss, + off); + else + printf("\t Active: %s%s%s\n", + on, + strna(i->active_state), + off); if (i->sysfs_path) printf("\t Device: %s\n", i->sysfs_path); @@ -1405,7 +1548,7 @@ static void print_status_info(UnitStatusInfo *i) { printf(" (%s)", t); free(t); } - } else { + } else if (i->exit_code > 0) { printf(" (code=%s, ", sigchld_code_to_string(i->exit_code)); if (i->exit_code == CLD_EXITED) @@ -1449,6 +1592,12 @@ static void print_status_info(UnitStatusInfo *i) { show_cgroup_by_path(i->default_control_group, "\t\t ", c); } + + if (i->need_daemon_reload) + printf("\n%sWarning:%s Unit file changed on disk, 'systemctl %s daemon-reload' recommended.\n", + ansi_highlight(true), + ansi_highlight(false), + arg_session ? "--session" : "--system"); } static int status_property(const char *name, DBusMessageIter *iter, UnitStatusInfo *i) { @@ -1495,6 +1644,8 @@ static int status_property(const char *name, DBusMessageIter *iter, UnitStatusIn if (streq(name, "Accept")) i->accept = b; + else if (streq(name, "NeedDaemonReload")) + i->need_daemon_reload = b; break; } @@ -1587,7 +1738,7 @@ static int print_property(const char *name, DBusMessageIter *iter) { /* This is a low-level property printer, see * print_status_info() for the nicer output */ - if (arg_property && !streq(name, arg_property)) + if (arg_property && !strv_find(arg_property, name)) return 0; switch (dbus_message_iter_get_arg_type(iter)) { @@ -2536,7 +2687,7 @@ finish: return r; } -static int clear_jobs(DBusConnection *bus, char **args, unsigned n) { +static int daemon_reload(DBusConnection *bus, char **args, unsigned n) { DBusMessage *m = NULL, *reply = NULL; DBusError error; int r; @@ -2552,10 +2703,12 @@ 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") || + streq(args[0], "cancel") ? "ClearJobs" : + streq(args[0], "daemon-reexec") ? "Reexecute" : + streq(args[0], "reset-maintenance") ? "ResetMaintenance" : + streq(args[0], "daemon-exit") ? "Exit" : + "Reload"; } if (!(m = dbus_message_new_method_call( @@ -2595,6 +2748,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 daemon_reload(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; @@ -2742,121 +2952,816 @@ finish: return r; } -static int systemctl_help(void) { - - printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Send control commands to 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" - " --fail When installing a new job, fail if conflicting jobs are\n" - " pending\n" - " --system Connect to system bus\n" - " --session Connect to session bus\n" - " --order When generating graph for dot, show only order\n" - " --require When generating graph for dot, show only requirement\n" - " -q --quiet Suppress output\n" - " --no-block Do not wait until operation finished\n" - " --no-wall Don't send wall message before halt/power-off/reboot\n\n" - "Commands:\n" - " list-units List units\n" - " start [NAME...] Start one or more units\n" - " stop [NAME...] Stop one or more units\n" - " reload [NAME...] Reload one or more units\n" - " restart [NAME...] Start or restart one or more units\n" - " try-restart [NAME...] Restart one or more units if active\n" - " reload-or-restart [NAME...] Reload one or more units is possible,\n" - " otherwise start or restart\n" - " reload-or-try-restart [NAME...] Reload one or more units is possible,\n" - " otherwise restart if active\n" - " isolate [NAME] Start one unit and stop all others\n" - " check [NAME...] Check whether units are active\n" - " status [NAME...] Show status of one or more units\n" - " show [NAME...|JOB...] Show properties of one or more\n" - " units/jobs/manager\n" - " load [NAME...] Load one or more units\n" - " list-jobs List jobs\n" - " cancel [JOB...] Cancel one or more jobs\n" - " clear-jobs Cancel all jobs\n" - " monitor Monitor unit/job changes\n" - " dump Dump server status\n" - " dot Dump dependency graph for dot(1)\n" - " snapshot [NAME] Create a snapshot\n" - " delete [NAME...] Remove one or more snapshots\n" - " daemon-reload Reload systemd manager configuration\n" - " daemon-reexec Reexecute systemd manager\n" - " daemon-exit Ask the systemd manager to quit\n" - " show-environment Dump environment\n" - " set-environment [NAME=VALUE...] Set one or more environment variables\n" - " unset-environment [NAME...] Unset one or more environment variables\n" - " halt Shut down and halt the system\n" - " poweroff Shut down and power-off the system\n" - " reboot Shut down and reboot the system\n" - " rescue Enter system rescue mode\n" - " emergency Enter system emergency mode\n" - " default Enter system default mode\n", - program_invocation_short_name); +typedef struct { + char *name; + char *path; - return 0; -} + char **aliases; + char **wanted_by; +} InstallInfo; -static int halt_help(void) { +static Hashmap *will_install = NULL, *have_installed = NULL; +static Set *remove_symlinks_to = NULL; - printf("%s [OPTIONS...]\n\n" - "%s the system.\n\n" - " --help Show this help\n" - " --halt Halt the machine\n" - " -p --poweroff Switch off the machine\n" - " --reboot Reboot the machine\n" - " -f --force Force immediate halt/power-off/reboot\n" - " -w --wtmp-only Don't halt/power-off/reboot, just write wtmp record\n" - " -d --no-wtmp Don't write wtmp record\n" - " -n --no-sync Don't sync before halt/power-off/reboot\n" - " --no-wall Don't send wall message before halt/power-off/reboot\n", - program_invocation_short_name, - arg_action == ACTION_REBOOT ? "Reboot" : - arg_action == ACTION_POWEROFF ? "Power off" : - "Halt"); +static void install_info_free(InstallInfo *i) { + assert(i); - return 0; + free(i->name); + free(i->path); + strv_free(i->aliases); + strv_free(i->wanted_by); + free(i); } -static int shutdown_help(void) { +static void install_info_hashmap_free(Hashmap *m) { + InstallInfo *i; - printf("%s [OPTIONS...] [now] [WALL...]\n\n" - "Shut down the system.\n\n" - " --help Show this help\n" - " -H --halt Halt the machine\n" - " -P --poweroff Power-off the machine\n" - " -r --reboot Reboot the machine\n" - " -h Equivalent to --poweroff, overriden by --halt\n" - " -k Don't halt/power-off/reboot, just send warnings\n" - " --no-wall Don't send wall message before halt/power-off/reboot\n", - program_invocation_short_name); + while ((i = hashmap_steal_first(m))) + install_info_free(i); - return 0; + hashmap_free(m); } -static int telinit_help(void) { +static bool unit_name_valid(const char *name) { - printf("%s [OPTIONS...] {COMMAND}\n\n" - "Send control commands to the init daemon.\n\n" - " --help Show this help\n" - " --no-wall Don't send wall message before halt/power-off/reboot\n\n" - "Commands:\n" - " 0 Power-off the machine\n" - " 6 Reboot the machine\n" - " 2, 3, 4, 5 Start runlevelX.target unit\n" - " 1, s, S Enter rescue mode\n" - " q, Q Reload init daemon configuration\n" - " u, U Reexecute init daemon\n", - program_invocation_short_name); + /* This is a minimal version of unit_name_valid() from + * unit-name.c */ - return 0; + if (!*name) + return false; + + if (ignore_file(name)) + return false; + + return true; } -static int runlevel_help(void) { +static int install_info_add(const char *name) { + InstallInfo *i; + int r; + + assert(will_install); + + if (!unit_name_valid(name)) + return -EINVAL; + + if (hashmap_get(have_installed, name) || + hashmap_get(will_install, name)) + return 0; + + if (!(i = new0(InstallInfo, 1))) { + r = -ENOMEM; + goto fail; + } + + if (!(i->name = strdup(name))) { + r = -ENOMEM; + goto fail; + } + + if ((r = hashmap_put(will_install, i->name, i)) < 0) + goto fail; + + return 0; + +fail: + if (i) + install_info_free(i); + + return r; +} + +static int config_parse_also( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + char *w; + size_t l; + char *state; + + assert(filename); + assert(lvalue); + assert(rvalue); + + FOREACH_WORD_QUOTED(w, l, rvalue, state) { + char *n; + int r; + + if (!(n = strndup(w, l))) + return -ENOMEM; + + r = install_info_add(n); + free(n); + + if (r < 0) + return r; + } + + return 0; +} + +static int mark_symlink_for_removal(const char *p) { + char *n; + int r; + + assert(p); + assert(path_is_absolute(p)); + + if (!remove_symlinks_to) + return 0; + + if (!(n = strdup(p))) + return -ENOMEM; + + path_kill_slashes(n); + + if ((r = set_put(remove_symlinks_to, n)) < 0) { + free(n); + return r == -EEXIST ? 0 : r; + } + + return 0; +} + +static int remove_marked_symlinks_fd(int fd, const char *config_path, const char *root, bool *deleted) { + int r = 0; + DIR *d; + struct dirent *de; + + assert(fd >= 0); + assert(root); + assert(deleted); + + if (!(d = fdopendir(fd))) { + close_nointr_nofail(fd); + return -errno; + } + + rewinddir(d); + + while ((de = readdir(d))) { + bool is_dir = false, is_link = false; + + if (ignore_file(de->d_name)) + continue; + + if (de->d_type == DT_LNK) + is_link = true; + else if (de->d_type == DT_DIR) + is_dir = true; + else if (de->d_type == DT_UNKNOWN) { + struct stat st; + + if (fstatat(fd, de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0) { + log_error("Failed to stat %s/%s: %m", root, de->d_name); + + if (r == 0) + r = -errno; + continue; + } + + is_link = S_ISLNK(st.st_mode); + is_dir = S_ISDIR(st.st_mode); + } else + continue; + + if (is_dir) { + int nfd, q; + char *p; + + if ((nfd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW)) < 0) { + log_error("Failed to open %s/%s: %m", root, de->d_name); + + if (r == 0) + r = -errno; + continue; + } + + if (asprintf(&p, "%s/%s", root, de->d_name) < 0) { + log_error("Failed to allocate directory string."); + close_nointr_nofail(nfd); + r = -ENOMEM; + break; + } + + /* This will close nfd, regardless whether it succeeds or not */ + q = remove_marked_symlinks_fd(nfd, config_path, p, deleted); + free(p); + + if (r == 0) + q = r; + + } else if (is_link) { + char *p, *dest, *c; + int q; + + if (asprintf(&p, "%s/%s", root, de->d_name) < 0) { + log_error("Failed to allocate symlink string."); + r = -ENOMEM; + break; + } + + if ((q = readlink_and_make_absolute(p, &dest)) < 0) { + log_error("Cannot read symlink %s: %s", p, strerror(-q)); + free(p); + + if (r == 0) + r = q; + continue; + } + + if ((c = canonicalize_file_name(dest))) { + /* This might fail if the destination + * is already removed */ + + free(dest); + dest = c; + } + + path_kill_slashes(dest); + if (set_get(remove_symlinks_to, dest)) { + + if (!arg_quiet) + log_info("rm '%s'", p); + + if (unlink(p) < 0) { + log_error("Cannot unlink symlink %s: %m", p); + + if (r == 0) + r = -errno; + } else { + rmdir_parents(p, config_path); + path_kill_slashes(p); + + if (!set_get(remove_symlinks_to, p)) { + + if ((r = mark_symlink_for_removal(p)) < 0) { + if (r == 0) + r = q; + } else + *deleted = true; + } + } + } + + free(p); + free(dest); + } + } + + closedir(d); + + return r; +} + +static int remove_marked_symlinks(const char *config_path) { + int fd, r = 0; + bool deleted; + + assert(config_path); + + if (set_size(remove_symlinks_to) <= 0) + return 0; + + if ((fd = open(config_path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW)) < 0) + return -errno; + + do { + int q, cfd; + deleted = false; + + if ((cfd = dup(fd)) < 0) { + r = -errno; + break; + } + + /* This takes possession of cfd and closes it */ + if ((q = remove_marked_symlinks_fd(cfd, config_path, config_path, &deleted)) < 0) { + if (r == 0) + r = q; + } + } while (deleted); + + close_nointr_nofail(fd); + + return r; +} + +static int create_symlink(const char *verb, const char *old_path, const char *new_path) { + int r; + + assert(old_path); + assert(new_path); + assert(verb); + + if (streq(verb, "enable")) { + char *dest; + + mkdir_parents(new_path, 0755); + + if (symlink(old_path, new_path) >= 0) { + + if (!arg_quiet) + log_info("ln -s '%s' '%s'", old_path, new_path); + + return 0; + } + + if (errno != EEXIST) { + log_error("Cannot link %s to %s: %m", old_path, new_path); + return -errno; + } + + if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { + + if (errno == EINVAL) { + log_error("Cannot link %s to %s, file exists already and is not a symlink.", old_path, new_path); + return -EEXIST; + } + + log_error("readlink() failed: %s", strerror(-r)); + return r; + } + + if (streq(dest, old_path)) { + free(dest); + return 0; + } + + if (!arg_force) { + log_error("Cannot link %s to %s, symlink exists already and points to %s.", old_path, new_path, dest); + free(dest); + return -EEXIST; + } + + free(dest); + unlink(new_path); + + if (!arg_quiet) + log_info("ln -s '%s' '%s'", old_path, new_path); + + if (symlink(old_path, new_path) >= 0) + return 0; + + log_error("Cannot link %s to %s: %m", old_path, new_path); + return -errno; + + } else if (streq(verb, "disable")) { + char *dest; + + if ((r = mark_symlink_for_removal(old_path)) < 0) + return r; + + if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { + if (errno == ENOENT) + return 0; + + if (errno == EINVAL) { + log_warning("File %s not a symlink, ignoring.", old_path); + return 0; + } + + log_error("readlink() failed: %s", strerror(-r)); + return r; + } + + if (!streq(dest, old_path)) { + log_warning("File %s not a symlink to %s but points to %s, ignoring.", new_path, old_path, dest); + free(dest); + return 0; + } + + free(dest); + + if ((r = mark_symlink_for_removal(new_path)) < 0) + return r; + + if (!arg_quiet) + log_info("rm '%s'", new_path); + + if (unlink(new_path) >= 0) + return 0; + + log_error("Cannot unlink %s: %m", new_path); + return -errno; + + } else if (streq(verb, "is-enabled")) { + char *dest; + + if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { + + if (errno == ENOENT || errno == EINVAL) + return 0; + + log_error("readlink() failed: %s", strerror(-r)); + return r; + } + + if (streq(dest, old_path)) { + free(dest); + return 1; + } + + return 0; + } + + assert_not_reached("Unknown action."); +} + +static int install_info_symlink_alias(const char *verb, InstallInfo *i, const char *config_path) { + char **s; + char *alias_path = NULL; + int r; + + assert(verb); + assert(i); + assert(config_path); + + STRV_FOREACH(s, i->aliases) { + + if (!unit_name_valid(*s)) { + log_error("Invalid name %s.", *s); + r = -EINVAL; + goto finish; + } + + free(alias_path); + if (!(alias_path = path_make_absolute(*s, config_path))) { + log_error("Out of memory"); + r = -ENOMEM; + goto finish; + } + + if ((r = create_symlink(verb, i->path, alias_path)) != 0) + goto finish; + + if (streq(verb, "disable")) + rmdir_parents(alias_path, config_path); + } + + r = 0; + +finish: + free(alias_path); + + return r; +} + +static int install_info_symlink_wants(const char *verb, InstallInfo *i, const char *config_path) { + char **s; + char *alias_path = NULL; + int r; + + assert(verb); + assert(i); + assert(config_path); + + STRV_FOREACH(s, i->wanted_by) { + if (!unit_name_valid(*s)) { + log_error("Invalid name %s.", *s); + r = -EINVAL; + goto finish; + } + + free(alias_path); + alias_path = NULL; + + if (asprintf(&alias_path, "%s/%s.wants/%s", config_path, *s, i->name) < 0) { + log_error("Out of memory"); + r = -ENOMEM; + goto finish; + } + + if ((r = create_symlink(verb, i->path, alias_path)) != 0) + goto finish; + + if (streq(verb, "disable")) + rmdir_parents(alias_path, config_path); + } + + r = 0; + +finish: + free(alias_path); + + return r; +} + +static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo *i, const char *config_path) { + + const ConfigItem items[] = { + { "Alias", config_parse_strv, &i->aliases, "Install" }, + { "WantedBy", config_parse_strv, &i->wanted_by, "Install" }, + { "Also", config_parse_also, NULL, "Install" }, + + { NULL, NULL, NULL, NULL } + }; + + char **p; + char *filename = NULL; + FILE *f = NULL; + int r; + + assert(paths); + assert(i); + + STRV_FOREACH(p, paths->unit_path) { + int fd; + + if (!(filename = path_make_absolute(i->name, *p))) { + log_error("Out of memory"); + return -ENOMEM; + } + + /* Ensure that we don't follow symlinks */ + if ((fd = open(filename, O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NOCTTY)) >= 0) + if ((f = fdopen(fd, "re"))) + break; + + if (errno == ELOOP) { + log_error("Refusing to operate on symlinks, please pass unit names or absolute paths to unit files."); + free(filename); + return -errno; + } + + if (errno != ENOENT) { + log_error("Failed to open %s: %m", filename); + free(filename); + return -errno; + } + + free(filename); + filename = NULL; + } + + if (!f) { + log_error("Couldn't find %s.", i->name); + return -ENOENT; + } + + i->path = filename; + + if ((r = config_parse(filename, f, NULL, items, true, i)) < 0) { + fclose(f); + return r; + } + + fclose(f); + + if ((r = install_info_symlink_alias(verb, i, config_path)) != 0) + return r; + + if ((r = install_info_symlink_wants(verb, i, config_path)) != 0) + return r; + + if ((r = mark_symlink_for_removal(filename)) < 0) + return r; + + if ((r = remove_marked_symlinks(config_path)) < 0) + return r; + + return 0; +} + +static char *get_config_path(void) { + + if (arg_session && arg_global) + return strdup(SESSION_CONFIG_UNIT_PATH); + + if (arg_session) { + char *p; + + if (session_config_home(&p) < 0) + return NULL; + + return p; + } + + return strdup(SYSTEM_CONFIG_UNIT_PATH); +} + +static int enable_unit(DBusConnection *bus, char **args, unsigned n) { + DBusError error; + int r; + LookupPaths paths; + char *config_path = NULL; + unsigned j; + InstallInfo *i; + const char *verb = args[0]; + + dbus_error_init(&error); + + zero(paths); + if ((r = lookup_paths_init(&paths, arg_session ? MANAGER_SESSION : MANAGER_SYSTEM)) < 0) { + log_error("Failed to determine lookup paths: %s", strerror(-r)); + goto finish; + } + + if (!(config_path = get_config_path())) { + log_error("Failed to determine config path"); + r = -ENOMEM; + goto finish; + } + + will_install = hashmap_new(string_hash_func, string_compare_func); + have_installed = hashmap_new(string_hash_func, string_compare_func); + + if (!will_install || !have_installed) { + log_error("Failed to allocate unit sets."); + r = -ENOMEM; + goto finish; + } + + if (!arg_defaults && streq(verb, "disable")) + if (!(remove_symlinks_to = set_new(string_hash_func, string_compare_func))) { + log_error("Failed to allocate symlink sets."); + r = -ENOMEM; + goto finish; + } + + for (j = 1; j < n; j++) + if ((r = install_info_add(args[j])) < 0) + goto finish; + + while ((i = hashmap_first(will_install))) { + int q; + + assert_se(hashmap_move_one(have_installed, will_install, i->name) == 0); + + if ((q = install_info_apply(verb, &paths, i, config_path)) != 0) { + + if (q < 0) { + if (r == 0) + r = q; + goto finish; + } + + /* In test mode and found something */ + r = 1; + break; + } + } + + if (streq(verb, "is-enabled")) + r = r > 0 ? 0 : -ENOENT; + else if (bus && + /* Don't try to reload anything if the user asked us to not do this */ + !arg_no_reload && + /* Don't try to reload anything when updating a unit globally */ + !arg_global && + /* Don't try to reload anything if we are called for system changes but the system wasn't booted with systemd */ + (arg_session || sd_booted() > 0) && + /* Don't try to reload anything if we are running in a chroot environment */ + (arg_session || running_in_chroot() <= 0) ) { + int q; + + if ((q = daemon_reload(bus, args, n)) < 0) + r = q; + } + +finish: + install_info_hashmap_free(will_install); + install_info_hashmap_free(have_installed); + + set_free_free(remove_symlinks_to); + + lookup_paths_free(&paths); + + free(config_path); + + return r; +} + +static int systemctl_help(void) { + + printf("%s [OPTIONS...] {COMMAND} ...\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 on output\n" + " --fail When queueing a new job, fail if conflicting jobs are\n" + " pending\n" + " -q --quiet Suppress output\n" + " --no-block Do not wait until operation finished\n" + " --system Connect to system bus\n" + " --session Connect to session bus\n" + " --order When generating graph for dot, show only order\n" + " --require When generating graph for dot, show only requirement\n" + " --no-wall Don't send wall message before halt/power-off/reboot\n" + " --global Enable/disable unit files globally\n" + " --no-reload When enabling/disabling unit files, don't reload daemon\n" + " configuration\n" + " --force When enabling unit files, override existing symlinks\n" + " --defaults When disabling unit files, remove default symlinks only\n\n" + "Commands:\n" + " list-units List units\n" + " start [NAME...] Start (activate) one or more units\n" + " stop [NAME...] Stop (deactivate) one or more units\n" + " reload [NAME...] Reload one or more units\n" + " restart [NAME...] Start or restart one or more units\n" + " try-restart [NAME...] Restart one or more units if active\n" + " reload-or-restart [NAME...] Reload one or more units is possible,\n" + " otherwise start or restart\n" + " reload-or-try-restart [NAME...] Reload one or more units is possible,\n" + " otherwise restart if active\n" + " isolate [NAME] Start one unit and stop all others\n" + " is-active [NAME...] Check whether units are active\n" + " status [NAME...] Show runtime status of one or more units\n" + " show [NAME...|JOB...] Show properties of one or more\n" + " units/jobs or the manager\n" + " reset-maintenance [NAME...] Reset maintenance state for all, one,\n" + " or more units\n" + " enable [NAME...] Enable one or more unit files\n" + " disable [NAME...] Disable one or more unit files\n" + " is-enabled [NAME...] Check whether unit files are enabled\n" + " load [NAME...] Load one or more units\n" + " list-jobs List jobs\n" + " cancel [JOB...] Cancel all, one, or more jobs\n" + " monitor Monitor unit/job changes\n" + " dump Dump server status\n" + " dot Dump dependency graph for dot(1)\n" + " snapshot [NAME] Create a snapshot\n" + " delete [NAME...] Remove one or more snapshots\n" + " daemon-reload Reload systemd manager configuration\n" + " daemon-reexec Reexecute systemd manager\n" + " daemon-exit Ask the systemd manager to quit\n" + " show-environment Dump environment\n" + " set-environment [NAME=VALUE...] Set one or more environment variables\n" + " unset-environment [NAME...] Unset one or more environment variables\n" + " halt Shut down and halt the system\n" + " poweroff Shut down and power-off the system\n" + " reboot Shut down and reboot the system\n" + " rescue Enter system rescue mode\n" + " emergency Enter system emergency mode\n" + " default Enter system default mode\n", + program_invocation_short_name); + + return 0; +} + +static int halt_help(void) { + + printf("%s [OPTIONS...]\n\n" + "%s the system.\n\n" + " --help Show this help\n" + " --halt Halt the machine\n" + " -p --poweroff Switch off the machine\n" + " --reboot Reboot the machine\n" + " -f --force Force immediate halt/power-off/reboot\n" + " -w --wtmp-only Don't halt/power-off/reboot, just write wtmp record\n" + " -d --no-wtmp Don't write wtmp record\n" + " -n --no-sync Don't sync before halt/power-off/reboot\n" + " --no-wall Don't send wall message before halt/power-off/reboot\n", + program_invocation_short_name, + arg_action == ACTION_REBOOT ? "Reboot" : + arg_action == ACTION_POWEROFF ? "Power off" : + "Halt"); + + return 0; +} + +static int shutdown_help(void) { + + printf("%s [OPTIONS...] [now] [WALL...]\n\n" + "Shut down the system.\n\n" + " --help Show this help\n" + " -H --halt Halt the machine\n" + " -P --poweroff Power-off the machine\n" + " -r --reboot Reboot the machine\n" + " -h Equivalent to --poweroff, overriden by --halt\n" + " -k Don't halt/power-off/reboot, just send warnings\n" + " --no-wall Don't send wall message before halt/power-off/reboot\n", + program_invocation_short_name); + + return 0; +} + +static int telinit_help(void) { + + printf("%s [OPTIONS...] {COMMAND}\n\n" + "Send control commands to the init daemon.\n\n" + " --help Show this help\n" + " --no-wall Don't send wall message before halt/power-off/reboot\n\n" + "Commands:\n" + " 0 Power-off the machine\n" + " 6 Reboot the machine\n" + " 2, 3, 4, 5 Start runlevelX.target unit\n" + " 1, s, S Enter rescue mode\n" + " q, Q Reload init daemon configuration\n" + " u, U Reexecute init daemon\n", + program_invocation_short_name); + + return 0; +} + +static int runlevel_help(void) { printf("%s [OPTIONS...]\n\n" "Prints the previous and current runlevel of the init system.\n\n" @@ -2872,26 +3777,36 @@ static int systemctl_parse_argv(int argc, char *argv[]) { ARG_FAIL = 0x100, ARG_SESSION, ARG_SYSTEM, + ARG_GLOBAL, ARG_NO_BLOCK, ARG_NO_WALL, ARG_ORDER, - ARG_REQUIRE + ARG_REQUIRE, + ARG_FULL, + ARG_FORCE, + ARG_NO_RELOAD, + ARG_DEFAULTS }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "type", required_argument, NULL, 't' }, - { "property", required_argument, NULL, 'p' }, - { "all", no_argument, NULL, 'a' }, - { "fail", no_argument, NULL, ARG_FAIL }, - { "session", no_argument, NULL, ARG_SESSION }, - { "system", no_argument, NULL, ARG_SYSTEM }, - { "no-block", no_argument, NULL, ARG_NO_BLOCK }, - { "no-wall", no_argument, NULL, ARG_NO_WALL }, - { "quiet", no_argument, NULL, 'q' }, - { "order", no_argument, NULL, ARG_ORDER }, - { "require", no_argument, NULL, ARG_REQUIRE }, - { NULL, 0, NULL, 0 } + { "help", no_argument, NULL, 'h' }, + { "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 }, + { "global", no_argument, NULL, ARG_GLOBAL }, + { "no-block", no_argument, NULL, ARG_NO_BLOCK }, + { "no-wall", no_argument, NULL, ARG_NO_WALL }, + { "quiet", no_argument, NULL, 'q' }, + { "order", no_argument, NULL, ARG_ORDER }, + { "require", no_argument, NULL, ARG_REQUIRE }, + { "force", no_argument, NULL, ARG_FORCE }, + { "no-reload", no_argument, NULL, ARG_NO_RELOAD }, + { "defaults", no_argument, NULL, ARG_DEFAULTS }, + { NULL, 0, NULL, 0 } }; int c; @@ -2911,14 +3826,21 @@ static int systemctl_parse_argv(int argc, char *argv[]) { arg_type = optarg; break; - case 'p': - arg_property = optarg; + case 'p': { + char **l; + + if (!(l = strv_append(arg_property, optarg))) + return -ENOMEM; + + strv_free(arg_property); + arg_property = l; /* If the user asked for a particular * property, show it to him, even if it is * empty. */ arg_all = true; break; + } case 'a': arg_all = true; @@ -2952,10 +3874,31 @@ 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; + case ARG_FORCE: + arg_force = true; + break; + + case ARG_NO_RELOAD: + arg_no_reload = true; + break; + + case ARG_GLOBAL: + arg_global = true; + arg_session = true; + break; + + case ARG_DEFAULTS: + arg_defaults = true; + break; + case '?': return -EINVAL; @@ -3011,7 +3954,8 @@ static int halt_parse_argv(int argc, char *argv[]) { break; case 'p': - arg_action = ACTION_POWEROFF; + if (arg_action != ACTION_REBOOT) + arg_action = ACTION_POWEROFF; break; case ARG_REBOOT: @@ -3287,8 +4231,22 @@ static int parse_argv(int argc, char *argv[]) { arg_action = ACTION_POWEROFF; return shutdown_parse_argv(argc, argv); } else if (strstr(program_invocation_short_name, "init")) { - arg_action = ACTION_INVALID; - return telinit_parse_argv(argc, argv); + + if (sd_booted() > 0) { + arg_action = ACTION_INVALID; + return telinit_parse_argv(argc, argv); + } else { + /* Hmm, so some other init system is + * running, we need to forward this + * request to it. For now we simply + * guess that it is Upstart. */ + + execv("/lib/upstart/telinit", argv); + + log_error("Couldn't find an alternative telinit implementation to spawn."); + return -EIO; + } + } else if (strstr(program_invocation_short_name, "runlevel")) { arg_action = ACTION_RUNLEVEL; return runlevel_parse_argv(argc, argv); @@ -3447,7 +4405,7 @@ static int talk_initctl(void) { return 1; } -static int systemctl_main(DBusConnection *bus, int argc, char *argv[]) { +static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError *error) { static const struct { const char* verb; @@ -3459,47 +4417,54 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[]) { const int argc; int (* const dispatch)(DBusConnection *bus, char **args, unsigned n); } verbs[] = { - { "list-units", LESS, 1, list_units }, - { "list-jobs", EQUAL, 1, list_jobs }, - { "clear-jobs", EQUAL, 1, clear_jobs }, - { "load", MORE, 2, load_unit }, - { "cancel", MORE, 2, cancel_job }, - { "start", MORE, 2, start_unit }, - { "stop", MORE, 2, start_unit }, - { "reload", MORE, 2, start_unit }, - { "restart", MORE, 2, start_unit }, - { "try-restart", MORE, 2, start_unit }, - { "reload-or-restart", MORE, 2, start_unit }, - { "reload-or-try-restart", MORE, 2, start_unit }, - { "isolate", EQUAL, 2, start_unit }, - { "check", MORE, 2, check_unit }, - { "show", MORE, 1, show }, - { "status", MORE, 2, show }, - { "monitor", EQUAL, 1, monitor }, - { "dump", EQUAL, 1, dump }, - { "dot", EQUAL, 1, dot }, - { "snapshot", LESS, 2, snapshot }, - { "delete", MORE, 2, delete_snapshot }, - { "daemon-reload", EQUAL, 1, clear_jobs }, - { "daemon-reexec", EQUAL, 1, clear_jobs }, - { "daemon-exit", EQUAL, 1, clear_jobs }, - { "show-environment", EQUAL, 1, show_enviroment }, - { "set-environment", MORE, 2, set_environment }, - { "unset-environment", MORE, 2, set_environment }, - { "halt", EQUAL, 1, start_special }, - { "poweroff", EQUAL, 1, start_special }, - { "reboot", EQUAL, 1, start_special }, - { "default", EQUAL, 1, start_special }, - { "rescue", EQUAL, 1, start_special }, - { "emergency", EQUAL, 1, start_special }, + { "list-units", LESS, 1, list_units }, + { "list-jobs", EQUAL, 1, list_jobs }, + { "clear-jobs", EQUAL, 1, daemon_reload }, + { "load", MORE, 2, load_unit }, + { "cancel", MORE, 2, cancel_job }, + { "start", MORE, 2, start_unit }, + { "stop", MORE, 2, start_unit }, + { "reload", MORE, 2, start_unit }, + { "restart", MORE, 2, start_unit }, + { "try-restart", MORE, 2, start_unit }, + { "reload-or-restart", MORE, 2, start_unit }, + { "reload-or-try-restart", MORE, 2, start_unit }, + { "force-reload", MORE, 2, start_unit }, /* For compatibility with SysV */ + { "condrestart", MORE, 2, start_unit }, /* For compatibility with RH */ + { "isolate", EQUAL, 2, start_unit }, + { "is-active", MORE, 2, check_unit }, + { "check", MORE, 2, check_unit }, + { "show", MORE, 1, show }, + { "status", MORE, 2, show }, + { "monitor", EQUAL, 1, monitor }, + { "dump", EQUAL, 1, dump }, + { "dot", EQUAL, 1, dot }, + { "snapshot", LESS, 2, snapshot }, + { "delete", MORE, 2, delete_snapshot }, + { "daemon-reload", EQUAL, 1, daemon_reload }, + { "daemon-reexec", EQUAL, 1, daemon_reload }, + { "daemon-exit", EQUAL, 1, daemon_reload }, + { "show-environment", EQUAL, 1, show_enviroment }, + { "set-environment", MORE, 2, set_environment }, + { "unset-environment", MORE, 2, set_environment }, + { "halt", EQUAL, 1, start_special }, + { "poweroff", EQUAL, 1, start_special }, + { "reboot", EQUAL, 1, start_special }, + { "default", EQUAL, 1, start_special }, + { "rescue", EQUAL, 1, start_special }, + { "emergency", EQUAL, 1, start_special }, + { "reset-maintenance", MORE, 1, reset_maintenance }, + { "enable", MORE, 2, enable_unit }, + { "disable", MORE, 2, enable_unit }, + { "is-enabled", MORE, 2, enable_unit } }; int left; unsigned i; - assert(bus); assert(argc >= 0); assert(argv); + assert(error); left = argc - optind; @@ -3552,6 +4517,15 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[]) { assert_not_reached("Unknown comparison operator."); } + /* Require a bus connection for all operations but + * enable/disable */ + if (!streq(verbs[i].verb, "enable") && + !streq(verbs[i].verb, "disable") && + !bus) { + log_error("Failed to get D-Bus connection: %s", error->message); + return -EIO; + } + return verbs[i].dispatch(bus, argv + optind, left); } @@ -3560,7 +4534,7 @@ static int reload_with_fallback(DBusConnection *bus) { if (bus) { /* First, try systemd via D-Bus. */ - if ((r = clear_jobs(bus, NULL, 0)) > 0) + if ((r = daemon_reload(bus, NULL, 0)) > 0) return 0; } @@ -3578,18 +4552,17 @@ static int reload_with_fallback(DBusConnection *bus) { static int start_with_fallback(DBusConnection *bus) { int r; - if (bus) { /* First, try systemd via D-Bus. */ if ((r = start_unit(bus, NULL, 0)) > 0) goto done; - - /* Hmm, talking to systemd via D-Bus didn't work. Then - * let's try to talk to Upstart via D-Bus. */ - if ((r = talk_upstart()) > 0) - goto done; } + /* Hmm, talking to systemd via D-Bus didn't work. Then + * let's try to talk to Upstart via D-Bus. */ + if ((r = talk_upstart()) > 0) + goto done; + /* Nothing else worked, so let's try * /dev/initctl */ if ((r = talk_initctl()) != 0) @@ -3657,7 +4630,7 @@ static int runlevel_main(void) { int r, runlevel, previous; if ((r = utmp_get_runlevel(&runlevel, &previous)) < 0) { - printf("unknown"); + printf("unknown\n"); return r; } @@ -3696,13 +4669,7 @@ int main(int argc, char*argv[]) { switch (arg_action) { case ACTION_SYSTEMCTL: { - - if (!bus) { - log_error("Failed to get D-Bus connection: %s", error.message); - goto finish; - } - - retval = systemctl_main(bus, argc, argv) < 0; + retval = systemctl_main(bus, argc, argv, &error) < 0; break; } @@ -3744,5 +4711,7 @@ finish: dbus_shutdown(); + strv_free(arg_property); + return retval; }