diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-05-18 11:17:24 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-05-18 11:17:24 +0200 |
| commit | 6784954b282ff45b5711afaa6938fba8e5821639 (patch) | |
| tree | c0fe2b4a2875f4dba83c4f3d0f628b036b3b6389 /recipes-core/systemd | |
| parent | 39bcca1e0eae4a976578894f3c05ecb91cdb0231 (diff) | |
Revert "systemd: fix DHCP on link state change"
This reverts commit 3cf2edb10f5e8ac60db7ca2e71d1e754a177d08c.
Conflicts:
recipes-core/systemd/systemd_%.bbappend
Diffstat (limited to 'recipes-core/systemd')
| -rw-r--r-- | recipes-core/systemd/systemd/networkd_dont_stop_the_dhcp_server.patch | 29 | ||||
| -rw-r--r-- | recipes-core/systemd/systemd_%.bbappend | 1 |
2 files changed, 0 insertions, 30 deletions
diff --git a/recipes-core/systemd/systemd/networkd_dont_stop_the_dhcp_server.patch b/recipes-core/systemd/systemd/networkd_dont_stop_the_dhcp_server.patch deleted file mode 100644 index 71e7920..0000000 --- a/recipes-core/systemd/systemd/networkd_dont_stop_the_dhcp_server.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dbafa734d8d6ba4cb5efcbb2260105babcdcde1e Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Sun, 26 Oct 2014 14:01:27 +0100 -Subject: [PATCH] networkd: don't stop the dhcp server when link goes down - ---- - src/network/networkd-link.c | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index c6e173f..26ef0fe 100644 ---- a/src/network/networkd-link.c -+++ b/src/network/networkd-link.c -@@ -344,15 +344,6 @@ static int link_stop_clients(Link *link) { - } - } - -- if (link->dhcp_server) { -- k = sd_dhcp_server_stop(link->dhcp_server); -- if (k < 0) { -- log_warning_link(link, "Could not stop DHCPv4 server: %s", -- strerror(-r)); -- r = k; -- } -- } -- - if(link->icmp6_router_discovery) { - - if (link->dhcp6_client) { diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend index df69043..8fbdc90 100644 --- a/recipes-core/systemd/systemd_%.bbappend +++ b/recipes-core/systemd/systemd_%.bbappend @@ -1,7 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:" SRC_URI += " \ - file://networkd_dont_stop_the_dhcp_server.patch \ file://rndis.network \ " |