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

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 6b13812cb..f0e6ad520 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -20,11 +20,12 @@
 ***/
 
 #include "sd-event.h"
+#include "sd-daemon.h"
 
 #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);
@@ -39,29 +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)
+                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_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,