X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=543a4e4d9593e923dc39ad80e6169841393447f8;hp=0aaef8b79232c9658dc1ce9704d588dd04a416ee;hb=8bde1d0c9d322f3b9a8dd24cfc8417b9231314d8;hpb=73432d67b590c8c8954cf2f8954d174a55d58c7b

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 0aaef8b79..543a4e4d9 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "capability.h"
-#include "sd-event.h"
 #include "sd-daemon.h"
 
 #include "networkd.h"
@@ -54,21 +53,19 @@ int main(int argc, char *argv[]) {
          * watches in. */
         r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid);
         if (r < 0)
-                log_error_errno(r, "Could not create runtime directory: %m");
+                log_warning_errno(r, "Could not create runtime directory: %m");
 
         r = mkdir_safe_label("/run/systemd/netif/links", 0755, uid, gid);
         if (r < 0)
-                log_error_errno(r, "Could not create runtime directory 'links': %m");
+                log_warning_errno(r, "Could not create runtime directory 'links': %m");
 
         r = mkdir_safe_label("/run/systemd/netif/leases", 0755, uid, gid);
         if (r < 0)
-                log_error_errno(r, "Could not create runtime directory 'leases': %m");
+                log_warning_errno(r, "Could not create runtime directory 'leases': %m");
 
         r = mkdir_safe_label("/run/systemd/netif/lldp", 0755, uid, gid);
         if (r < 0)
-                log_error("Could not create runtime directory 'lldp': %s",
-                          strerror(-r));
-
+                log_warning_errno(r, "Could not create runtime directory 'lldp': %m");
 
         r = drop_privileges(uid, gid,
                             (1ULL << CAP_NET_ADMIN) |
@@ -86,6 +83,12 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
+        r = manager_connect_bus(m);
+        if (r < 0) {
+                log_error_errno(r, "Could not connect to bus: %m");
+                goto out;
+        }
+
         r = manager_load_config(m);
         if (r < 0) {
                 log_error_errno(r, "Could not load configuration files: %m");
@@ -110,7 +113,7 @@ int main(int argc, char *argv[]) {
                   "READY=1\n"
                   "STATUS=Processing requests...");
 
-        r = sd_event_loop(m->event);
+        r = manager_run(m);
         if (r < 0) {
                 log_error_errno(r, "Event loop failed: %m");
                 goto out;