chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8e337e6
)
machinectl: close bus to container early
author
Lennart Poettering
<lennart@poettering.net>
Thu, 7 Nov 2013 23:49:44 +0000
(
00:49
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 8 Nov 2013 13:07:26 +0000
(14:07 +0100)
src/machine/machinectl.c
patch
|
blob
|
history
diff --git
a/src/machine/machinectl.c
b/src/machine/machinectl.c
index 4b8351c98a95735fe9cd2f18df21bc71c3731379..a1890aa855a82a389a37ca6c4f14d9e20828ab60 100644
(file)
--- 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) {
}
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) },
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) },
{}
};
{ "Id", "ay", bus_map_id128, offsetof(MachineStatusInfo, id) },
{}
};
+
+ MachineStatusInfo info = {};
int r;
assert(path);
int r;
assert(path);
@@
-603,6
+605,8
@@
static int login_machine(sd_bus *bus, char **args, unsigned n) {
return r;
}
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);
assert_se(sigemptyset(&mask) == 0);
sigset_add_many(&mask, SIGWINCH, SIGTERM, SIGINT, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);