X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=2f6a12dbccfddb58f5068a63ff1fb7b1c86141bb;hb=f0c4cd7a2c2835a392b5b1807d8c506ab0af44de;hp=1d43361201222f20b3fc88c077b931254d3423e0;hpb=02b59d57e0c08231645120077f651151f5bb2bab;p=elogind.git

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 1d4336120..2f6a12dbc 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -25,7 +25,7 @@
 #include "networkd.h"
 
 int main(int argc, char *argv[]) {
-        _cleanup_manager_free_ Manager *m;
+        _cleanup_manager_free_ Manager *m = NULL;
         int r;
 
         log_set_target(LOG_TARGET_AUTO);
@@ -40,33 +40,64 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
+        /* Always create the directories people can create inotify
+         * watches in. */
+        mkdir_label("/run/systemd/network/links", 0755);
+        mkdir_label("/run/systemd/network/leases", 0755);
+
         r = manager_new(&m);
-        if (r < 0)
+        if (r < 0) {
+                log_error("Could not create manager: %s", strerror(-r));
                 goto out;
-
-        r = manager_load_config(m);
-        if (r < 0)
-                return EXIT_FAILURE;
+        }
 
         r = manager_udev_listen(m);
-        if (r < 0)
+        if (r < 0) {
+                log_error("Could not connect to udev: %s", strerror(-r));
+                goto out;
+        }
+
+        r = manager_rtnl_listen(m);
+        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)
+        if (r < 0) {
+                log_error("Could not enumerate links: %s", strerror(-r));
                 goto out;
+        }
 
-        r = manager_rtnl_listen(m);
-        if (r < 0)
+        /* 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,