summaryrefslogtreecommitdiff
path: root/src/network/networkd-network.c
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-12-04 21:57:13 +0100
committerTom Gundersen <teg@jklm.no>2014-12-05 00:38:10 +0100
commitc106cc36b9b8e8998eb95299b02f1db9c1209122 (patch)
treef60a30744029dd69fb0ba47e5bc21c79d516b162 /src/network/networkd-network.c
parentc18c2a0ea15820c49226aa05f294f5d5c1417263 (diff)
networkd: add basic [Link] settings to .network files
This allows the default link settings (set in .link files) to be overridden per Network. Only MTU and MACAddress is supported for now.
Diffstat (limited to 'src/network/networkd-network.c')
-rw-r--r--src/network/networkd-network.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index cb111382f5..b014a6b649 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -90,7 +90,14 @@ static int network_load_one(Manager *manager, const char *filename) {
network->llmnr = LLMNR_SUPPORT_YES;
r = config_parse(NULL, filename, file,
- "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0BridgePort\0",
+ "Match\0"
+ "Link\0"
+ "Network\0"
+ "Address\0"
+ "Route\0"
+ "DHCP\0"
+ "DHCPv4\0"
+ "BridgePort\0",
config_item_perf_lookup, network_network_gperf_lookup,
false, false, true, network);
if (r < 0)
@@ -163,6 +170,8 @@ void network_free(Network *network) {
free(network->description);
free(network->dhcp_vendor_class_identifier);
+ free(network->mac);
+
strv_free(network->ntp);
strv_free(network->dns);
strv_free(network->domains);