network: do not abort execution when a config file cannot be loaded
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 11 Sep 2019 09:24:41 +0000 (18:24 +0900)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 21 Sep 2019 20:55:28 +0000 (22:55 +0200)
Closes #13516.

(cherry picked from commit be7110826eb4d7d0fafee4790562e0dedb9d817b)

src/network/netdev/netdev.c
src/network/networkd-network.c

index 7735b455b79d57e1462a22535aae51e2308bb865..7853e197f1355a2c42118dcba8f206d358001384 100644 (file)
@@ -844,7 +844,7 @@ int netdev_load(Manager *manager) {
         STRV_FOREACH(f, files) {
                 r = netdev_load_one(manager, *f);
                 if (r < 0)
-                        return r;
+                        log_error_errno(r, "Failed to load %s, ignoring: %m", *f);
         }
 
         return 0;
index 2b8d0eb2fbbf983fae64282b27e84ba36a1850a3..fe81f1b72009c33baa518074f3143449444b7b89 100644 (file)
@@ -506,7 +506,7 @@ int network_load(Manager *manager) {
         STRV_FOREACH(f, files) {
                 r = network_load_one(manager, *f);
                 if (r < 0)
-                        return r;
+                        log_error_errno(r, "Failed to load %s, ignoring: %m", *f);
         }
 
         return 0;