X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=f0e6ad5201a5476f35ceb1e20cbc9b030313cb1c;hb=4dd5da7f7d37f964fe95b0f0d451d7843a34591d;hp=360afba986056e3ceab0eb765ff230c231197488;hpb=e877666c1553a3dd5b05b4c48090f889ffc079e6;p=elogind.git

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 360afba98..f0e6ad520 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -40,33 +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_udev_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) {
+                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,