|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
From 18aa6c0119fbcad1e569f1d178c4f1691d4e3b90 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
From: Steven Noonan <steven@uplinklabs.net>
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
Date: Thu, 3 Jul 2014 19:42:19 -0700
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
Subject: [PATCH] networkd: accept section DHCP in systemd.network files
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
(cherry picked from commit c38d2eb828f1a62ae9052c9db45ccc70f98fdb47)
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
---
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
src/network/networkd-network.c | 2 +-
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
index 9ab4f23068..9f6de18538 100644
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
--- a/src/network/networkd-network.c
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
+++ b/src/network/networkd-network.c
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
@@ -92,7 +92,7 @@ static int network_load_one(Manager *manager, const char *filename) {
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
network->dhcp_routes = true;
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
network->dhcp_sendhost = true;
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
- r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCPv4\0", config_item_perf_lookup,
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
+ r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0", config_item_perf_lookup,
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
(void*) network_network_gperf_lookup, false, false, network);
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
if (r < 0) {
|
|
Zbigniew Jędrzejewski-Szmek |
43ff24 |
log_warning("Could not parse config file %s: %s", filename, strerror(-r));
|