shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

networkd: move the connection to the bus out of manager_new (again)

Browse Source 
This would otherwise make the tests fail as we cannot grab the bus name.
This commit is contained in:
Tom Gundersen 2015-02-05 18:00:16 +01:00
parent 4852e15970
commit 8f203c166e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/networkd-manager.c
View File

@ -78,8 +78,6 @@ static int setup_default_address_pool(Manager *m) {
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;
@ -437,10 +435,6 @@ int manager_new(Manager **ret) {
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;

6
src/network/networkd.c
View File

@ -86,6 +86,12 @@ int main(int argc, char *argv[]) {
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);
if (r < 0) {
log_error_errno(r, "Could not load configuration files: %m");

1
src/network/networkd.h
View File

@ -239,6 +239,7 @@ extern const sd_bus_vtable manager_vtable[];
int manager_new(Manager **ret);
void manager_free(Manager *m);
int manager_connect_bus(Manager *m);
int manager_run(Manager *m);
int manager_load_config(Manager *m);