From: Tom Gundersen Date: Mon, 10 Mar 2014 22:40:34 +0000 (+0100) Subject: networkd: rework startup X-Git-Tag: v211~26 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f0c4cd7a2c2835a392b5b1807d8c506ab0af44de networkd: rework startup Open all listenerns before loading configuration. --- diff --git a/src/network/networkd.c b/src/network/networkd.c index a80740bbe..2f6a12dbc 100644 --- a/src/network/networkd.c +++ b/src/network/networkd.c @@ -51,33 +51,33 @@ int main(int argc, char *argv[]) { goto out; } - r = manager_load_config(m); + r = manager_udev_listen(m); if (r < 0) { - log_error("Could not load configuration files: %s", strerror(-r)); + log_error("Could not connect to udev: %s", strerror(-r)); goto out; } - r = manager_udev_listen(m); + r = manager_rtnl_listen(m); if (r < 0) { - log_error("Could not connect to udev: %s", strerror(-r)); + log_error("Could not connect to rtnl: %s", strerror(-r)); goto out; } - r = manager_udev_enumerate_links(m); + r = manager_bus_listen(m); if (r < 0) { - log_error("Could not enumerate links: %s", strerror(-r)); + log_error("Could not connect to system bus: %s", strerror(-r)); goto out; } - r = manager_rtnl_listen(m); + r = manager_load_config(m); if (r < 0) { - log_error("Could not connect to rtnl: %s", strerror(-r)); + log_error("Could not load configuration files: %s", strerror(-r)); goto out; } - r = manager_bus_listen(m); + r = manager_udev_enumerate_links(m); if (r < 0) { - log_error("Could not connect to system bus: %s", strerror(-r)); + log_error("Could not enumerate links: %s", strerror(-r)); goto out; }