resolved: add daemon to manage resolv.conf

[elogind.git] / src / network / networkd.c

diff --git a/src/network/networkd.c b/src/network/networkd.c
index a80740bbea00497b7e4e2bf5a27b9ef7a07a2a07..6985dcaa4a64f07cd25a7aa79376404385c5aec2 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -42,8 +42,20 @@ int main(int argc, char *argv[]) {
 
         /* 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 = 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) {
@@ -51,24 +63,12 @@ int main(int argc, char *argv[]) {
                 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) {
                 log_error("Could not connect to udev: %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;
-        }
-
         r = manager_rtnl_listen(m);
         if (r < 0) {
                 log_error("Could not connect to rtnl: %s", strerror(-r));
@@ -81,11 +81,15 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
-        /* write out empty resolv.conf to avoid a
-         * dangling symlink */
-        r = manager_update_resolv_conf(m);
+        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 create resolv.conf: %s", strerror(-r));
+                log_error("Could not enumerate links: %s", strerror(-r));
                 goto out;
         }