X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=a80740bbea00497b7e4e2bf5a27b9ef7a07a2a07;hb=63edaa623bee43c934a0c357e8c6498992429391;hp=ed93ffb3fc4dbf697c3c908aca42f16f3429e12a;hpb=f579559b3a14c1f1ef96c372e7626c4733e6ef7d;p=elogind.git

diff --git a/src/network/networkd.c b/src/network/networkd.c
index ed93ffb3f..a80740bbe 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);
@@ -35,24 +36,72 @@ int main(int argc, char *argv[]) {
 
         if (argc != 1) {
                 log_error("This program takes no arguments.");
-                return EXIT_FAILURE;
+                r = -EINVAL;
+                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)
-                return EXIT_FAILURE;
+        if (r < 0) {
+                log_error("Could not create manager: %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_listen(m);
-        if (r < 0)
-                return EXIT_FAILURE;
+        if (r < 0) {
+                log_error("Could not connect to udev: %s", strerror(-r));
+                goto out;
+        }
 
         r = manager_udev_enumerate_links(m);
-        if (r < 0)
-                return EXIT_FAILURE;
+        if (r < 0) {
+                log_error("Could not enumerate links: %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;
+        }
+
+        /* 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)
-                return EXIT_FAILURE;
+        if (r < 0) {
+                log_error("Event loop failed: %s", strerror(-r));
+                goto out;
+        }
+
+out:
+        sd_notify(false,
+                  "STATUS=Shutting down...");
 
-        return  EXIT_SUCCESS;
+        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }