X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=0b4af9067717a4d29b0a43ff44a0bbef6f768660;hp=fdb80368d4dddfce19cfcd5cbd6068e3b9770418;hb=5fae368bda9419d9d378ea32077c8fd183dd4b81;hpb=af4ec4309e8f82aad87a8d574785c12f8763d5f8

diff --git a/src/network/networkd.c b/src/network/networkd.c
index fdb80368d..0b4af9067 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -46,7 +46,7 @@ int main(int argc, char *argv[]) {
 
         r = get_user_creds(&user, &uid, &gid, NULL, NULL);
         if (r < 0) {
-                log_error("Cannot resolve user name %s: %s", user, strerror(-r));
+                log_error_errno(r, "Cannot resolve user name %s: %m", user);
                 goto out;
         }
 
@@ -54,19 +54,22 @@ int main(int argc, char *argv[]) {
          * watches in. */
         r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid);
         if (r < 0)
-                log_error("Could not create runtime directory: %s",
-                          strerror(-r));
+                log_error_errno(r, "Could not create runtime directory: %m");
 
         r = mkdir_safe_label("/run/systemd/netif/links", 0755, uid, gid);
         if (r < 0)
-                log_error("Could not create runtime directory 'links': %s",
-                          strerror(-r));
+                log_error_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("Could not create runtime directory 'leases': %s",
+                log_error_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));
 
+
         r = drop_privileges(uid, gid,
                             (1ULL << CAP_NET_ADMIN) |
                             (1ULL << CAP_NET_BIND_SERVICE) |
@@ -79,37 +82,25 @@ int main(int argc, char *argv[]) {
 
         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) {
-                log_error("Could not connect to udev: %s", strerror(-r));
+                log_error_errno(r, "Could not create manager: %m");
                 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);
+        r = manager_load_config(m);
         if (r < 0) {
-                log_error("Could not connect to system bus: %s", strerror(-r));
+                log_error_errno(r, "Could not load configuration files: %m");
                 goto out;
         }
 
-        r = manager_load_config(m);
+        r = manager_rtnl_enumerate_links(m);
         if (r < 0) {
-                log_error("Could not load configuration files: %s", strerror(-r));
+                log_error_errno(r, "Could not enumerate links: %m");
                 goto out;
         }
 
-        r = manager_rtnl_enumerate_links(m);
+        r = manager_rtnl_enumerate_addresses(m);
         if (r < 0) {
-                log_error("Could not enumerate links: %s", strerror(-r));
+                log_error_errno(r, "Could not enumerate links: %m");
                 goto out;
         }
 
@@ -119,7 +110,7 @@ int main(int argc, char *argv[]) {
 
         r = sd_event_loop(m->event);
         if (r < 0) {
-                log_error("Event loop failed: %s", strerror(-r));
+                log_error_errno(r, "Event loop failed: %m");
                 goto out;
         }