summaryrefslogtreecommitdiff
path: root/src/libsystemd
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-03-17 03:31:38 +0100
committerLennart Poettering <lennart@poettering.net>2014-03-17 04:00:44 +0100
commit1238ee09b7babb175b9bf7ad1d0e8eb2a414ee6e (patch)
treecf21f3744760337b86a9956f19fa1a4022bbb48a /src/libsystemd
parent9ec65868668839136ee10bcf6785938c3ad9a1a1 (diff)
systemctl: introduce -r switch to show units running in local containers in addition to the host
Diffstat (limited to 'src/libsystemd')
-rw-r--r--src/libsystemd/sd-bus/bus-util.c2
-rw-r--r--src/libsystemd/sd-bus/bus-util.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
index 3b07993b2a..df7ab8a83a 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1192,6 +1192,8 @@ int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
assert(message);
assert(u);
+ u->machine = NULL;
+
return sd_bus_message_read(
message,
"(ssssssouso)",
diff --git a/src/libsystemd/sd-bus/bus-util.h b/src/libsystemd/sd-bus/bus-util.h
index b0936208fb..8103555fe8 100644
--- a/src/libsystemd/sd-bus/bus-util.h
+++ b/src/libsystemd/sd-bus/bus-util.h
@@ -123,6 +123,7 @@ int bus_log_parse_error(int r);
int bus_log_create_error(int r);
typedef struct UnitInfo {
+ const char *machine;
const char *id;
const char *description;
const char *load_state;