chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: instead of exposing the dbus1 flags when acquiring a name use our own that are...
[elogind.git]
/
src
/
machine
/
machined.c
diff --git
a/src/machine/machined.c
b/src/machine/machined.c
index 35b33c30186fbe7da0195d32ddc1bd9a83a57bcb..6550075b564412f51c4055435a95c2c539d5a9e5 100644
(file)
--- a/
src/machine/machined.c
+++ b/
src/machine/machined.c
@@
-59,6
+59,8
@@
Manager *manager_new(void) {
return NULL;
}
return NULL;
}
+ sd_event_set_watchdog(m->event, true);
+
return m;
}
return m;
}
@@
-217,7
+219,7
@@
static int manager_connect_bus(Manager *m) {
return r;
}
return r;
}
- r = sd_bus_request_name(m->bus, "org.freedesktop.machine1",
SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE
);
+ r = sd_bus_request_name(m->bus, "org.freedesktop.machine1",
0
);
if (r < 0) {
log_error("Failed to register name: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to register name: %s", strerror(-r));
return r;