chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: move the connection to the bus out of manager_new (again)
[elogind.git]
/
src
/
network
/
networkd-manager.c
diff --git
a/src/network/networkd-manager.c
b/src/network/networkd-manager.c
index 02ab9f95efefc79caefdba8f9d9c81ac2da7a6de..8dfe4377de4a202738fc86ad4f02e4c2e0cbe2f6 100644
(file)
--- a/
src/network/networkd-manager.c
+++ b/
src/network/networkd-manager.c
@@
-78,8
+78,6
@@
static int setup_default_address_pool(Manager *m) {
return 0;
}
return 0;
}
-int manager_connect_bus(Manager *m);
-
static int on_bus_retry(sd_event_source *s, usec_t usec, void *userdata) {
Manager *m = userdata;
static int on_bus_retry(sd_event_source *s, usec_t usec, void *userdata) {
Manager *m = userdata;
@@
-437,10
+435,6
@@
int manager_new(Manager **ret) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = manager_connect_bus(m);
- if (r < 0)
- return r;
-
r = manager_connect_udev(m);
if (r < 0)
return r;
r = manager_connect_udev(m);
if (r < 0)
return r;