DEPENDENCY_REVERSE,
DEPENDENCY_AFTER,
DEPENDENCY_BEFORE,
+ _DEPENDENCY_MAX
} arg_dependency = DEPENDENCY_FORWARD;
static const char *arg_job_mode = "replace";
static UnitFileScope arg_scope = UNIT_FILE_SYSTEM;
static int daemon_reload(sd_bus *bus, char **args);
static int halt_now(enum action a);
+static int check_one_unit(sd_bus *bus, const char *name, const char *good_states, bool quiet);
+
static void pager_open_if_enabled(void) {
if (arg_no_pager)
for (i = level - 1; i >= 0; i--) {
len += 2;
- if(len > max_len - 3 && !arg_full) {
+ if (len > max_len - 3 && !arg_full) {
printf("%s...\n",max_len % 2 ? "" : " ");
return 0;
}
}
len += 2;
- if(len > max_len - 3 && !arg_full) {
+ if (len > max_len - 3 && !arg_full) {
printf("%s...\n",max_len % 2 ? "" : " ");
return 0;
}
}
n = ellipsize(name, max_len-len, 100);
- if(!n)
+ if (!n)
return log_oom();
printf("%s\n", n);
static int list_dependencies_get_dependencies(sd_bus *bus, const char *name, char ***deps) {
- static const char *dependencies[] = {
+ static const char *dependencies[_DEPENDENCY_MAX] = {
[DEPENDENCY_FORWARD] = "Requires\0"
"RequiresOverridable\0"
"Requisite\0"
assert(bus);
assert(name);
assert(deps);
- assert(arg_dependency < ELEMENTSOF(dependencies));
+ assert_cc(ELEMENTSOF(dependencies) == _DEPENDENCY_MAX);
path = unit_dbus_path_from_name(name);
if (!path)
qsort_safe(deps, strv_length(deps), sizeof (char*), list_dependencies_compare);
STRV_FOREACH(c, deps) {
+ int state;
+
if (strv_contains(u, *c)) {
if (!arg_plain) {
r = list_dependencies_print("...", level + 1, (branches << 1) | (c[1] == NULL ? 0 : 1), 1);
continue;
}
+ state = check_one_unit(bus, *c, "activating\0active\0reloading\0", true);
+ if (state > 0)
+ printf("%s%s%s", ansi_highlight_green(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());
+ else
+ printf("%s%s%s", ansi_highlight_red(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());
+
r = list_dependencies_print(*c, level, branches, c[1] == NULL);
if (r < 0)
return r;
if (arg_all || unit_name_to_type(*c) == UNIT_TARGET) {
r = list_dependencies_one(bus, *c, level + 1, &u, (branches << 1) | (c[1] == NULL ? 0 : 1));
- if(r < 0)
+ if (r < 0)
return r;
}
}
char *result;
} WaitData;
-static int wait_filter(sd_bus *bus, sd_bus_message *m, void *data) {
+static int wait_filter(sd_bus *bus, sd_bus_message *m, void *data, sd_bus_error *error) {
WaitData *d = data;
assert(bus);
}
#endif
- log_error("Failed to parse message.");
+ bus_log_parse_error(r);
}
return 0;
return log_oom();
while (!set_isempty(s)) {
- for(;;) {
+ for (;;) {
r = sd_bus_process(bus, NULL);
if (r < 0)
return r;
q = start_unit_one(bus, method, *name, mode, &error, s);
if (q < 0) {
- r = translate_bus_error_to_exit_status(r, &error);
+ r = translate_bus_error_to_exit_status(q, &error);
sd_bus_error_free(&error);
}
}
return r;
}
-static int show_one_by_pid(
- const char *verb,
+static int get_unit_dbus_path_by_pid(
sd_bus *bus,
uint32_t pid,
- bool *new_line,
- bool *ellipsized) {
+ char **unit) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
- const char *path = NULL;
int r;
r = sd_bus_call_method(
return r;
}
- r = sd_bus_message_read(reply, "o", &path);
+ r = sd_bus_message_read(reply, "o", unit);
if (r < 0)
return bus_log_parse_error(r);
- return show_one(verb, bus, path, false, new_line, ellipsized);
+ return 0;
}
static int show_all(
if (r < 0)
return r;
+ pager_open_if_enabled();
+
c = (unsigned) r;
qsort_safe(unit_infos, c, sizeof(UnitInfo), compare_unit_info);
if (!p)
return log_oom();
- printf("%s -> '%s'\n", u->id, p);
-
r = show_one(verb, bus, p, show_properties, new_line, ellipsized);
if (r != 0)
return r;
return 0;
}
+static int cat(sd_bus *bus, char **args) {
+ int r = 0;
+ char **name;
+
+ _cleanup_free_ char *unit = NULL, *n = NULL;
+
+ assert(bus);
+ assert(args);
+
+ pager_open_if_enabled();
+
+ STRV_FOREACH(name, args+1) {
+ _cleanup_free_ char *fragment_path = NULL;
+ _cleanup_strv_free_ char **dropin_paths = NULL;
+ sd_bus_error error;
+ char **path;
+
+ n = unit_name_mangle(*name);
+ if (!n)
+ return log_oom();
+
+ unit = unit_dbus_path_from_name(n);
+ if (!unit)
+ return log_oom();
+
+ if (need_daemon_reload(bus, n) > 0)
+ log_warning("Unit file of %s changed on disk. Run 'systemctl%s daemon-reload'.",
+ n, arg_scope == UNIT_FILE_SYSTEM ? "" : " --user");
+
+ r = sd_bus_get_property_string(
+ bus,
+ "org.freedesktop.systemd1",
+ unit,
+ "org.freedesktop.systemd1.Unit",
+ "FragmentPath",
+ &error,
+ &fragment_path);
+ if (r < 0) {
+ log_warning("Failed to get FragmentPath: %s", bus_error_message(&error, r));
+ continue;
+ }
+
+ r = sd_bus_get_property_strv(
+ bus,
+ "org.freedesktop.systemd1",
+ unit,
+ "org.freedesktop.systemd1.Unit",
+ "DropInPaths",
+ &error,
+ &dropin_paths);
+ if (r < 0) {
+ log_warning("Failed to get DropInPaths: %s", bus_error_message(&error, r));
+ continue;
+ }
+
+ if (!isempty(fragment_path)) {
+ fprintf(stdout, "# %s\n", fragment_path);
+ fflush(stdout);
+ r = sendfile_full(STDOUT_FILENO, fragment_path);
+ if (r < 0) {
+ log_warning("Failed to cat %s: %s", fragment_path, strerror(-r));
+ continue;
+ }
+ }
+
+ STRV_FOREACH(path, dropin_paths) {
+ fprintf(stdout, "%s# %s\n",
+ isempty(fragment_path) && path == dropin_paths ? "" : "\n",
+ *path);
+ fflush(stdout);
+ r = sendfile_full(STDOUT_FILENO, *path);
+ if (r < 0) {
+ log_warning("Failed to cat %s: %s", *path, strerror(-r));
+ continue;
+ }
+ }
+ }
+
+ return r;
+}
+
static int show(sd_bus *bus, char **args) {
int r, ret = 0;
bool show_properties, show_status, new_line = false;
ret = show_all(args[0], bus, false, &new_line, &ellipsized);
else
STRV_FOREACH(name, args+1) {
+ _cleanup_free_ char *unit = NULL;
uint32_t id;
if (safe_atou32(*name, &id) < 0) {
- _cleanup_free_ char *p = NULL, *n = NULL;
+ _cleanup_free_ char *n = NULL;
/* Interpret as unit name */
n = unit_name_mangle(*name);
if (!n)
return log_oom();
- p = unit_dbus_path_from_name(n);
- if (!p)
+ unit = unit_dbus_path_from_name(n);
+ if (!unit)
return log_oom();
- r = show_one(args[0], bus, p, show_properties, &new_line, &ellipsized);
- if (r != 0)
- ret = r;
-
} else if (show_properties) {
- _cleanup_free_ char *p = NULL;
-
/* Interpret as job id */
- if (asprintf(&p, "/org/freedesktop/systemd1/job/%u", id) < 0)
+ if (asprintf(&unit, "/org/freedesktop/systemd1/job/%u", id) < 0)
return log_oom();
- r = show_one(args[0], bus, p, show_properties, &new_line, &ellipsized);
- if (r != 0)
- ret = r;
-
} else {
/* Interpret as PID */
- r = show_one_by_pid(args[0], bus, id, &new_line, &ellipsized);
- if (r != 0)
+ r = get_unit_dbus_path_by_pid(bus, id, &unit);
+ if (r < 0)
ret = r;
}
+
+ show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized);
}
if (ellipsized && !arg_quiet)
return bus_log_parse_error(r);
}
- r = deserialize_and_dump_unit_file_changes(m);
+ r = deserialize_and_dump_unit_file_changes(reply);
if (r < 0)
return r;
" -a --all Show all loaded units/properties, including dead/empty\n"
" ones. To list all units installed on the system, use\n"
" the 'list-unit-files' command instead.\n"
- " --reverse Show reverse dependencies with 'list-dependencies'\n"
" -l --full Don't ellipsize unit names on output\n"
- " --fail When queueing a new job, fail if conflicting jobs are\n"
- " pending\n"
- " --irreversible When queueing a new job, make sure it cannot be implicitly\n"
- " cancelled\n"
- " --ignore-dependencies\n"
- " When queueing a new job, ignore all its dependencies\n"
+ " --reverse Show reverse dependencies with 'list-dependencies'\n"
+ " --job-mode=MODE Specify how to deal with already queued jobs, when\n"
+ " queueing a new job\n"
" --show-types When showing sockets, explicitly show their type\n"
" -i --ignore-inhibitors\n"
" When shutting down or sleeping, ignore inhibitors\n"
" status [NAME...|PID...] 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"
+ " cat [NAME...] Show files and drop-ins of one or more units\n"
" set-property [NAME] [ASSIGNMENT...]\n"
" Sets one or more properties of a unit\n"
" help [NAME...|PID...] Show manual for one or more units\n"
const char *t;
puts("Available unit types:");
- for(i = 0; i < _UNIT_TYPE_MAX; i++) {
+ for (i = 0; i < _UNIT_TYPE_MAX; i++) {
t = unit_type_to_string(i);
if (t)
puts(t);
ARG_RUNTIME,
ARG_FORCE,
ARG_PLAIN,
- ARG_STATE
+ ARG_STATE,
+ ARG_JOB_MODE
};
static const struct option options[] = {
{ "show-types", no_argument, NULL, ARG_SHOW_TYPES },
{ "failed", no_argument, NULL, ARG_FAILED }, /* compatibility only */
{ "full", no_argument, NULL, 'l' },
- { "fail", no_argument, NULL, ARG_FAIL },
- { "irreversible", no_argument, NULL, ARG_IRREVERSIBLE },
- { "ignore-dependencies", no_argument, NULL, ARG_IGNORE_DEPENDENCIES },
+ { "job-mode", required_argument, NULL, ARG_JOB_MODE },
+ { "fail", no_argument, NULL, ARG_FAIL }, /* compatibility only */
+ { "irreversible", no_argument, NULL, ARG_IRREVERSIBLE }, /* compatibility only */
+ { "ignore-dependencies", no_argument, NULL, ARG_IGNORE_DEPENDENCIES }, /* compatibility only */
{ "ignore-inhibitors", no_argument, NULL, 'i' },
{ "user", no_argument, NULL, ARG_USER },
{ "system", no_argument, NULL, ARG_SYSTEM },
arg_show_types = true;
break;
+ case ARG_JOB_MODE:
+ arg_job_mode = optarg;
+ break;
+
case ARG_FAIL:
arg_job_mode = "fail";
break;
{ "check", MORE, 2, check_unit_active },
{ "is-failed", MORE, 2, check_unit_failed },
{ "show", MORE, 1, show },
+ { "cat", MORE, 2, cat },
{ "status", MORE, 1, show },
{ "help", MORE, 2, show },
{ "snapshot", LESS, 2, snapshot },
~ianmdlvl / elogind.git / blobdiff