picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

analyze: use normal bus connection for "plot" verb (#7685) 

We need to connect to hostnamed, so a private bus connection is no good.
It'd be simpler to use the normal bus connection unconditionally, but
that'd mean that e.g. systemd-analyze set-log-level might not work in
emergency mode. So let's keep trying to use the private connection except
for "plot".

Fixes #7667.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-12-18 19:35:03 +01:00 committed by Lennart Poettering
parent bd8fdbcfc5
commit bf0e0a4df2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/analyze/analyze.c
View File

@ -130,6 +130,13 @@ struct host_info {
char *architecture;
};
static int acquire_bus(bool need_full_bus, sd_bus **bus) {
if (need_full_bus)
return bus_connect_transport(arg_transport, arg_host, arg_user, bus);
else
return bus_connect_transport_systemd(arg_transport, arg_host, arg_user, bus);
}
static int bus_get_uint64_property(sd_bus *bus, const char *path, const char *interface, const char *property, uint64_t *val) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
int r;
@ -1688,7 +1695,7 @@ int main(int argc, char *argv[]) {
else {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
r = bus_connect_transport_systemd(arg_transport, arg_host, arg_user, &bus);
r = acquire_bus(streq_ptr(argv[optind], "plot"), &bus);
if (r < 0) {
log_error_errno(r, "Failed to create bus connection: %m");
goto finish;