networkd: netdev - verify name of newlink messages

[elogind.git] / src / network / networkd.c

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 0e3892007fe3c53b1f7723fbf7ea7129495504e3..6b3bf12a4cf3e32299d4dcb52dab159b204cd97f 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -40,33 +40,56 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
+        /* Always create the directories people can create inotify
+         * watches in. */
+        r = mkdir_label("/run/systemd/network", 0755);
+        if (r < 0)
+                log_error("Could not create runtime directory: %s",
+                          strerror(-r));
+
+        r = mkdir_label("/run/systemd/network/links", 0755);
+        if (r < 0)
+                log_error("Could not create runtime directory 'links': %s",
+                          strerror(-r));
+
+        r = mkdir_label("/run/systemd/network/leases", 0755);
+        if (r < 0)
+                log_error("Could not create runtime directory 'leases': %s",
+                          strerror(-r));
+
         r = manager_new(&m);
         if (r < 0) {
                 log_error("Could not create manager: %s", strerror(-r));
                 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_rtnl_enumerate_links(m);
+        if (r < 0) {
+                log_error("Could not enumerate links: %s", strerror(-r));
                 goto out;
         }