Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu

Hi,

I'd like to make a stable upload for stretch.

It fixes an issue in networkd, which is not enabled by default, but
apparently sees increased usage, so it seems worthwile fixing it, as it
can result in loss of IPv4 connectivity on DHCPv4 lease expirations.


Full debdiff is attached.

Regards,
Michael

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), 
LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff --git a/debian/changelog b/debian/changelog
index 5971d52..a985539 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+systemd (232-25+deb9u12) stretch; urgency=medium
+
+  * networkd: Do not stop ndisc client in case of conf error.
+    When an NDisc error happens, e.g. in case of a prefix change, do not shut
+    down the dhcp client. Instead log about it and continue.
+    Otherwise networkd might fail to renew the DHCPv4 address and lose IPv4
+    connectivity. (Closes: #930353)
+
+ -- Michael Biebl <bi...@debian.org>  Sun, 21 Jul 2019 20:43:29 +0200
+
 systemd (232-25+deb9u11) stretch-security; urgency=high
 
   * pam-systemd: use secure_getenv() rather than getenv()
diff --git 
a/debian/patches/networkd-ndisc-Do-not-stop-ndisc-client-incase-of-conf-er.patch
 
b/debian/patches/networkd-ndisc-Do-not-stop-ndisc-client-incase-of-conf-er.patch
new file mode 100644
index 0000000..015fb35
--- /dev/null
+++ 
b/debian/patches/networkd-ndisc-Do-not-stop-ndisc-client-incase-of-conf-er.patch
@@ -0,0 +1,32 @@
+From: Susant Sahani <sus...@redhat.com>
+Date: Tue, 26 Sep 2017 17:17:32 +0530
+Subject: networkd: ndisc Do not stop ndisc client incase of conf error.
+
+Now in ndisc_netlink_handler if route or address fails we stop the clients.
+link_enter_failed->link_stop_clients that is dhcp, ndisc etc.
+
+The clients should be keep on running .
+
+Fixes #5625
+
+(cherry picked from commit 7f676aa324cb5498a5f9caaaa3d51ecfe53242e0)
+---
+ src/network/networkd-ndisc.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
+index d3fa56b..1513d66 100644
+--- a/src/network/networkd-ndisc.c
++++ b/src/network/networkd-ndisc.c
+@@ -37,10 +37,8 @@ static int ndisc_netlink_handler(sd_netlink *rtnl, 
sd_netlink_message *m, void *
+         link->ndisc_messages--;
+ 
+         r = sd_netlink_message_get_errno(m);
+-        if (r < 0 && r != -EEXIST) {
++        if (r < 0 && r != -EEXIST)
+                 log_link_error_errno(link, r, "Could not set NDisc route or 
address: %m");
+-                link_enter_failed(link);
+-        }
+ 
+         if (link->ndisc_messages == 0) {
+                 link->ndisc_configured = true;
diff --git a/debian/patches/series b/debian/patches/series
index ddd4a0b..411780d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -100,6 +100,7 @@ 
mount-util-accept-that-name_to_handle_at-might-fail-with-.patch
 automount-ack-automount-requests-even-when-already-mounte.patch
 backport-read_line-from-systemd-master.patch
 core-when-deserializing-state-always-use-read_line-LONG_L.patch
+networkd-ndisc-Do-not-stop-ndisc-client-incase-of-conf-er.patch
 debian/Use-Debian-specific-config-files.patch
 debian/don-t-try-to-start-autovt-units-when-not-running-wit.patch
 debian/Make-logind-hostnamed-localed-timedated-D-Bus-activa.patch

Reply via email to