networkd: move the connection to the bus out of manager_new (again)
This would otherwise make the tests fail as we cannot grab the bus name.
This commit is contained in:
parent
4852e15970
commit
8f203c166e
|
@ -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) {
|
static int on_bus_retry(sd_event_source *s, usec_t usec, void *userdata) {
|
||||||
Manager *m = userdata;
|
Manager *m = userdata;
|
||||||
|
|
||||||
|
@ -437,10 +435,6 @@ int manager_new(Manager **ret) {
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
r = manager_connect_bus(m);
|
|
||||||
if (r < 0)
|
|
||||||
return r;
|
|
||||||
|
|
||||||
r = manager_connect_udev(m);
|
r = manager_connect_udev(m);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
|
|
@ -86,6 +86,12 @@ int main(int argc, char *argv[]) {
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
r = manager_connect_bus(m);
|
||||||
|
if (r < 0) {
|
||||||
|
log_error_errno(r, "Could not connect to bus: %m");
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
r = manager_load_config(m);
|
r = manager_load_config(m);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
log_error_errno(r, "Could not load configuration files: %m");
|
log_error_errno(r, "Could not load configuration files: %m");
|
||||||
|
|
|
@ -239,6 +239,7 @@ extern const sd_bus_vtable manager_vtable[];
|
||||||
int manager_new(Manager **ret);
|
int manager_new(Manager **ret);
|
||||||
void manager_free(Manager *m);
|
void manager_free(Manager *m);
|
||||||
|
|
||||||
|
int manager_connect_bus(Manager *m);
|
||||||
int manager_run(Manager *m);
|
int manager_run(Manager *m);
|
||||||
|
|
||||||
int manager_load_config(Manager *m);
|
int manager_load_config(Manager *m);
|
||||||
|
|
Loading…
Reference in New Issue