X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=6b3bf12a4cf3e32299d4dcb52dab159b204cd97f;hb=4d473d5dded03d3b682dc389d610bb6b2db6e5f7;hp=055200cb005560d8a08997c187fd3bf916ae41ae;hpb=3bef724f7e7f7eaca69881548b06e221b77d7031;p=elogind.git

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 055200cb0..6b3bf12a4 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -40,40 +40,76 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
-        r = manager_new(&m);
+        /* Always create the directories people can create inotify
+         * watches in. */
+        r = mkdir_label("/run/systemd/network", 0755);
         if (r < 0)
-                goto out;
+                log_error("Could not create runtime directory: %s",
+                          strerror(-r));
 
-        r = manager_load_config(m);
+        r = mkdir_label("/run/systemd/network/links", 0755);
         if (r < 0)
-                return EXIT_FAILURE;
+                log_error("Could not create runtime directory 'links': %s",
+                          strerror(-r));
 
-        r = manager_udev_listen(m);
+        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_udev_enumerate_links(m);
-        if (r < 0)
+        r = manager_udev_listen(m);
+        if (r < 0) {
+                log_error("Could not connect to udev: %s", strerror(-r));
                 goto out;
+        }
 
         r = manager_rtnl_listen(m);
-        if (r < 0)
+        if (r < 0) {
+                log_error("Could not connect to rtnl: %s", strerror(-r));
                 goto out;
+        }
 
+        r = manager_bus_listen(m);
+        if (r < 0) {
+                log_error("Could not connect to system bus: %s", strerror(-r));
+                goto out;
+        }
+
+        r = manager_load_config(m);
+        if (r < 0) {
+                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;
+        }
 
         /* write out empty resolv.conf to avoid a
          * dangling symlink */
         r = manager_update_resolv_conf(m);
-        if (r < 0)
+        if (r < 0) {
+                log_error("Could not create resolv.conf: %s", strerror(-r));
                 goto out;
+        }
 
         sd_notify(false,
                   "READY=1\n"
                   "STATUS=Processing requests...");
 
         r = sd_event_loop(m->event);
-        if (r < 0)
+        if (r < 0) {
+                log_error("Event loop failed: %s", strerror(-r));
                 goto out;
+        }
 
 out:
         sd_notify(false,