chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: rename netdev variables
[elogind.git]
/
src
/
systemctl
/
systemctl.c
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index 1b381f7a90680d6a661fcff02c2916601b4b5e7c..b11fee515cc67c4d8fcb3675d16369b563eea5a9 100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-319,12
+319,6
@@
static int compare_unit_info(const void *a, const void *b) {
static bool output_show_unit(const UnitInfo *u, char **patterns) {
const char *dot;
static bool output_show_unit(const UnitInfo *u, char **patterns) {
const char *dot;
- if (!strv_isempty(arg_states))
- return
- strv_contains(arg_states, u->load_state) ||
- strv_contains(arg_states, u->sub_state) ||
- strv_contains(arg_states, u->active_state);
-
if (!strv_isempty(patterns)) {
char **pattern;
if (!strv_isempty(patterns)) {
char **pattern;
@@
-513,6
+507,7
@@
static int get_unit_list(
int c,
sd_bus_message **_reply) {
int c,
sd_bus_message **_reply) {
+ _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
size_t size = c;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
size_t size = c;
@@
-523,15
+518,22
@@
static int get_unit_list(
assert(unit_infos);
assert(_reply);
assert(unit_infos);
assert(_reply);
- r = sd_bus_
call_method
(
+ r = sd_bus_
message_new_method_call
(
bus,
bus,
+ &m,
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager",
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager",
- "ListUnits",
- &error,
- &reply,
- NULL);
+ "ListUnitsFiltered");
+
+ if (r < 0)
+ return bus_log_create_error(r);
+
+ r = sd_bus_message_append_strv(m, arg_states);
+ if (r < 0)
+ return bus_log_create_error(r);
+
+ r = sd_bus_call(bus, m, 0, &error, &reply);
if (r < 0) {
log_error("Failed to list units: %s", bus_error_message(&error, r));
return r;
if (r < 0) {
log_error("Failed to list units: %s", bus_error_message(&error, r));
return r;
@@
-1430,7
+1432,7
@@
static int list_dependencies_print(const char *name, int level, unsigned int bra
printf("%s...\n",max_len % 2 ? "" : " ");
return 0;
}
printf("%s...\n",max_len % 2 ? "" : " ");
return 0;
}
- printf("%s", draw_special_char(branches & (1 << i) ? DRAW_TREE_VERT : DRAW_TREE_SPACE));
+ printf("%s", draw_special_char(branches & (1 << i) ? DRAW_TREE_VERT
ICAL
: DRAW_TREE_SPACE));
}
len += 2;
}
len += 2;
@@
-1598,9
+1600,9
@@
static int list_dependencies_one(
state = check_one_unit(bus, *c, "activating\0active\0reloading\0", true);
if (state > 0)
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());
+ printf("%s%s%s
", ansi_highlight_green(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());
else
else
- printf("%s%s%s", ansi_highlight_red(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());
+ 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)
r = list_dependencies_print(*c, level, branches, c[1] == NULL);
if (r < 0)
@@
-1833,7
+1835,7
@@
static void output_machines_list(struct machine_info *machine_infos, unsigned n)
on_failed = off_failed = "";
if (circle_len > 0)
on_failed = off_failed = "";
if (circle_len > 0)
- printf("%s%s%s
", on_state, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : "
", off_state);
+ printf("%s%s%s
", on_state, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : "
", off_state);
if (m->is_host)
printf("%-*s (host) %s%-*s%s %s%*u%s %*u\n",
if (m->is_host)
printf("%-*s (host) %s%-*s%s %s%*u%s %*u\n",
@@
-2305,6
+2307,7
@@
static int enable_wait_for_jobs(sd_bus *bus) {
r = sd_bus_add_match(
bus,
r = sd_bus_add_match(
bus,
+ NULL,
"type='signal',"
"sender='org.freedesktop.systemd1',"
"interface='org.freedesktop.systemd1.Manager',"
"type='signal',"
"sender='org.freedesktop.systemd1',"
"interface='org.freedesktop.systemd1.Manager',"
@@
-2364,13
+2367,14
@@
static int check_wait_response(WaitData *d) {
}
static int wait_for_jobs(sd_bus *bus, Set *s) {
}
static int wait_for_jobs(sd_bus *bus, Set *s) {
+ _cleanup_bus_slot_unref_ sd_bus_slot *slot = NULL;
WaitData d = { .set = s };
int r = 0, q;
assert(bus);
assert(s);
WaitData d = { .set = s };
int r = 0, q;
assert(bus);
assert(s);
- q = sd_bus_add_filter(bus, wait_filter, &d);
+ q = sd_bus_add_filter(bus,
&slot,
wait_filter, &d);
if (q < 0)
return log_oom();
if (q < 0)
return log_oom();
@@
-2398,10
+2402,6
@@
static int wait_for_jobs(sd_bus *bus, Set *s) {
d.result = NULL;
}
d.result = NULL;
}
- q = sd_bus_remove_filter(bus, wait_filter, &d);
- if (q < 0 && r == 0)
- r = q;
-
return r;
}
return r;
}
@@
-2886,8
+2886,8
@@
static int check_inhibitors(sd_bus *bus, enum action a) {
get_process_comm(pid, &comm);
user = uid_to_name(uid);
get_process_comm(pid, &comm);
user = uid_to_name(uid);
- log_warning("Operation inhibited by \"%s\" (PID
%lu
\"%s\", user %s), reason is \"%s\".",
- who,
(unsigned long)
pid, strna(comm), strna(user), why);
+ log_warning("Operation inhibited by \"%s\" (PID
"PID_FMT"
\"%s\", user %s), reason is \"%s\".",
+ who, pid, strna(comm), strna(user), why);
c++;
}
c++;
}
@@
-3234,7
+3234,7
@@
static void print_status_info(
} else
active_on = active_off = "";
} else
active_on = active_off = "";
- printf("%s%s%s%s", active_on, draw_special_char(DRAW_BLACK_CIRCLE), active_off, strna(i->id));
+ printf("%s%s%s
%s", active_on, draw_special_char(DRAW_BLACK_CIRCLE), active_off, strna(i->id));
if (i->description && !streq_ptr(i->id, i->description))
printf(" - %s", i->description);
if (i->description && !streq_ptr(i->id, i->description))
printf(" - %s", i->description);
@@
-4258,7
+4258,7
@@
static int get_unit_dbus_path_by_pid(
&reply,
"u", pid);
if (r < 0) {
&reply,
"u", pid);
if (r < 0) {
- log_error("Failed to get unit for PID
%lu: %s", (unsigned long)
pid, bus_error_message(&error, r));
+ log_error("Failed to get unit for PID
"PID_FMT": %s",
pid, bus_error_message(&error, r));
return r;
}
return r;
}
@@
-4285,7
+4285,7
@@
static int show_all(
_cleanup_free_ UnitInfo *unit_infos = NULL;
const UnitInfo *u;
unsigned c;
_cleanup_free_ UnitInfo *unit_infos = NULL;
const UnitInfo *u;
unsigned c;
- int r;
+ int r
, ret = 0
;
r = get_unit_list(bus, NULL, NULL, &unit_infos, 0, &reply);
if (r < 0)
r = get_unit_list(bus, NULL, NULL, &unit_infos, 0, &reply);
if (r < 0)
@@
-4307,9
+4307,11
@@
static int show_all(
r = show_one(verb, bus, p, show_properties, new_line, ellipsized);
if (r < 0)
return r;
r = show_one(verb, bus, p, show_properties, new_line, ellipsized);
if (r < 0)
return r;
+ else if (r > 0 && ret == 0)
+ ret = r;
}
}
- return
0
;
+ return
ret
;
}
static int show_system_status(sd_bus *bus) {
}
static int show_system_status(sd_bus *bus) {
@@
-4338,7
+4340,7
@@
static int show_system_status(sd_bus *bus) {
} else
on = off = "";
} else
on = off = "";
- printf("%s%s%s%s\n", on, draw_special_char(DRAW_BLACK_CIRCLE), off, arg_host ? arg_host : hn);
+ printf("%s%s%s
%s\n", on, draw_special_char(DRAW_BLACK_CIRCLE), off, arg_host ? arg_host : hn);
printf(" State: %s%s%s\n",
on, strna(mi.state), off);
printf(" State: %s%s%s\n",
on, strna(mi.state), off);
@@
-4431,7
+4433,12
@@
static int show(sd_bus *bus, char **args) {
}
}
}
}
- show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized);
+ r = show_one(args[0], bus, unit, show_properties,
+ &new_line, &ellipsized);
+ if (r < 0)
+ return r;
+ else if (r > 0 && ret == 0)
+ ret = r;
}
if (!strv_isempty(patterns)) {
}
if (!strv_isempty(patterns)) {
@@
-4448,7
+4455,12
@@
static int show(sd_bus *bus, char **args) {
if (!unit)
return log_oom();
if (!unit)
return log_oom();
- show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized);
+ r = show_one(args[0], bus, unit, show_properties,
+ &new_line, &ellipsized);
+ if (r < 0)
+ return r;
+ else if (r > 0 && ret == 0)
+ ret = r;
}
}
}
}
}
}
@@
-4992,18
+5004,18
@@
static int enable_sysv_units(const char *verb, char **args) {
/* Processes all SysV units, and reshuffles the array so that
* afterwards only the native units remain */
/* Processes all SysV units, and reshuffles the array so that
* afterwards only the native units remain */
- r = lookup_paths_init(&paths, SYSTEMD_SYSTEM, false, NULL, NULL, NULL);
+ r = lookup_paths_init(&paths, SYSTEMD_SYSTEM, false,
arg_root,
NULL, NULL, NULL);
if (r < 0)
return r;
r = 0;
for (f = 0; args[f]; f++) {
const char *name;
if (r < 0)
return r;
r = 0;
for (f = 0; args[f]; f++) {
const char *name;
- _cleanup_free_ char *p = NULL, *q = NULL;
+ _cleanup_free_ char *p = NULL, *q = NULL
, *l = NULL
;
bool found_native = false, found_sysv;
unsigned c = 1;
const char *argv[6] = { "/sbin/chkconfig", NULL, NULL, NULL, NULL };
bool found_native = false, found_sysv;
unsigned c = 1;
const char *argv[6] = { "/sbin/chkconfig", NULL, NULL, NULL, NULL };
- char **k
, *l
;
+ char **k;
int j;
pid_t pid;
siginfo_t status;
int j;
pid_t pid;
siginfo_t status;
@@
-5017,20
+5029,19
@@
static int enable_sysv_units(const char *verb, char **args) {
continue;
STRV_FOREACH(k, paths.unit_path) {
continue;
STRV_FOREACH(k, paths.unit_path) {
+ _cleanup_free_ char *path = NULL;
+
if (!isempty(arg_root))
if (!isempty(arg_root))
- asprintf(&p, "%s/%s/%s", arg_root, *k, name);
+ asprintf(&p
ath
, "%s/%s/%s", arg_root, *k, name);
else
else
- asprintf(&p, "%s/%s", *k, name);
+ asprintf(&p
ath
, "%s/%s", *k, name);
- if (!p) {
+ if (!p
ath
) {
r = log_oom();
goto finish;
}
r = log_oom();
goto finish;
}
- found_native = access(p, F_OK) >= 0;
- free(p);
- p = NULL;
-
+ found_native = access(path, F_OK) >= 0;
if (found_native)
break;
}
if (found_native)
break;
}
@@
-5047,9
+5058,8
@@
static int enable_sysv_units(const char *verb, char **args) {
goto finish;
}
goto finish;
}
- p[strlen(p) - s
izeof(".service") + 1
] = 0;
+ p[strlen(p) - s
trlen(".service")
] = 0;
found_sysv = access(p, F_OK) >= 0;
found_sysv = access(p, F_OK) >= 0;
-
if (!found_sysv)
continue;
if (!found_sysv)
continue;
@@
-5074,7
+5084,6
@@
static int enable_sysv_units(const char *verb, char **args) {
}
log_info("Executing %s", l);
}
log_info("Executing %s", l);
- free(l);
pid = fork();
if (pid < 0) {
pid = fork();
if (pid < 0) {
@@
-5916,7
+5925,7
@@
static int systemctl_parse_argv(int argc, char *argv[]) {
case 'r':
if (geteuid() != 0) {
case 'r':
if (geteuid() != 0) {
- log_error("--recursive requires root privil
i
ges.");
+ log_error("--recursive requires root privil
e
ges.");
return -EPERM;
}
return -EPERM;
}
@@
-6018,13
+6027,10
@@
static int halt_parse_argv(int argc, char *argv[]) {
}
}
}
}
- if (arg_action == ACTION_REBOOT && argc == optind + 1) {
- r = write_string_file(REBOOT_PARAM_FILE, argv[optind]);
- if (r < 0) {
- log_error("Failed to write reboot param to "
- REBOOT_PARAM_FILE": %s", strerror(-r));
+ if (arg_action == ACTION_REBOOT && (argc == optind || argc == optind + 1)) {
+ r = update_reboot_param_file(argc == optind + 1 ? argv[optind] : NULL);
+ if (r < 0)
return r;
return r;
- }
} else if (optind < argc) {
log_error("Too many arguments.");
return -EINVAL;
} else if (optind < argc) {
log_error("Too many arguments.");
return -EINVAL;