nspawn: require /etc/os-release only for init

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

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index e70329473158ad59c6f452fc0fdb73394eaecc0a..5d930235b3286b20a9049a78486875979524496b 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -84,12 +84,6 @@ static int network_load_one(Manager *manager, const char *filename) {
                                     "Ignoring", filename);
                         return 0;
                 }
-
-                if (route->dst_family && route->family != route->dst_family) {
-                        log_warning("Route section with conflicting Gateway and Destination address "
-                                    "family configured in %s. Ignoring", filename);
-                        return 0;
-                }
         }
 
         LIST_FOREACH(static_addresses, address, network->static_addresses) {
@@ -223,7 +217,7 @@ int config_parse_bridge(const char *unit,
                 void *data,
                 void *userdata) {
         Network *network = userdata;
-        Netdev *netdev;
+        NetDev *netdev;
         int r;
 
         assert(filename);
@@ -240,7 +234,7 @@ int config_parse_bridge(const char *unit,
 
         if (netdev->kind != NETDEV_KIND_BRIDGE) {
                 log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                           "Netdev is not a bridge, ignoring assignment: %s", rvalue);
+                           "NetDev is not a bridge, ignoring assignment: %s", rvalue);
                 return 0;
         }
 
@@ -260,7 +254,7 @@ int config_parse_bond(const char *unit,
                 void *data,
                 void *userdata) {
         Network *network = userdata;
-        Netdev *netdev;
+        NetDev *netdev;
         int r;
 
         assert(filename);
@@ -277,7 +271,7 @@ int config_parse_bond(const char *unit,
 
         if (netdev->kind != NETDEV_KIND_BOND) {
                 log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                           "Netdev is not a bond, ignoring assignment: %s", rvalue);
+                           "NetDev is not a bond, ignoring assignment: %s", rvalue);
                 return 0;
         }
 
@@ -285,3 +279,40 @@ int config_parse_bond(const char *unit,
 
         return 0;
 }
+
+int config_parse_vlan(const char *unit,
+                const char *filename,
+                unsigned line,
+                const char *section,
+                unsigned section_line,
+                const char *lvalue,
+                int ltype,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+        Network *network = userdata;
+        NetDev *netdev;
+        int r;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        r = netdev_get(network->manager, rvalue, &netdev);
+        if (r < 0) {
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                           "VLAN is invalid, ignoring assignment: %s", rvalue);
+                return 0;
+        }
+
+        if (netdev->kind != NETDEV_KIND_VLAN) {
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+                           "NetDev is not a VLAN, ignoring assignment: %s", rvalue);
+                return 0;
+        }
+
+        network->vlan = netdev;
+
+        return 0;
+}