summaryrefslogtreecommitdiff
path: root/src/machine/machinectl.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-11-08 00:49:44 +0100
committerLennart Poettering <lennart@poettering.net>2013-11-08 14:07:26 +0100
commita6c616024db23fef34152c1432892824a07799cc (patch)
treec8b4161423b2657b04c8c7448150ded9b2ad1956 /src/machine/machinectl.c
parent8e337e6438e1168d9a3bf8e623a26b2211290c24 (diff)
machinectl: close bus to container early
Diffstat (limited to 'src/machine/machinectl.c')
-rw-r--r--src/machine/machinectl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 4b8351c98a..a1890aa855 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -226,7 +226,7 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) {
}
static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_line) {
- MachineStatusInfo info = {};
+
static const struct bus_properties_map map[] = {
{ "Name", "s", NULL, offsetof(MachineStatusInfo, name) },
{ "Class", "s", NULL, offsetof(MachineStatusInfo, class) },
@@ -238,6 +238,8 @@ static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_
{ "Id", "ay", bus_map_id128, offsetof(MachineStatusInfo, id) },
{}
};
+
+ MachineStatusInfo info = {};
int r;
assert(path);
@@ -603,6 +605,8 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) {
return r;
}
+ container_bus = sd_bus_unref(container_bus);
+
assert_se(sigemptyset(&mask) == 0);
sigset_add_many(&mask, SIGWINCH, SIGTERM, SIGINT, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);