From: mhoellein <mario@hoellein.online>
Date: Thu, 16 Sep 2021 04:51:09 +0000 (+0200)
Subject: committing changes in /etc made by "apt-get upgrade"
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=3ee726ba5e41d984200765d5a5b2b5c874e58210;p=vserver

committing changes in /etc made by "apt-get upgrade"

Package changes:
-curl 7.68.0-1ubuntu2.6 amd64
+curl 7.68.0-1ubuntu2.7 amd64
-libcurl3-gnutls 7.68.0-1ubuntu2.6 amd64
-libcurl4 7.68.0-1ubuntu2.6 amd64
+libcurl3-gnutls 7.68.0-1ubuntu2.7 amd64
+libcurl4 7.68.0-1ubuntu2.7 amd64
-libllvm12 1:12.0.0-3ubuntu1~20.04.3 amd64
+libllvm12 1:12.0.0-3ubuntu1~20.04.4 amd64
-libnss-systemd 245.4-4ubuntu3.11 amd64
+libnss-systemd 245.4-4ubuntu3.13 amd64
-libpam-systemd 245.4-4ubuntu3.11 amd64
+libpam-systemd 245.4-4ubuntu3.13 amd64
-libsystemd0 245.4-4ubuntu3.11 amd64
+libsystemd0 245.4-4ubuntu3.13 amd64
-libudev1 245.4-4ubuntu3.11 amd64
+libudev1 245.4-4ubuntu3.13 amd64
-systemd 245.4-4ubuntu3.11 amd64
-systemd-sysv 245.4-4ubuntu3.11 amd64
-systemd-timesyncd 245.4-4ubuntu3.11 amd64
+systemd 245.4-4ubuntu3.13 amd64
+systemd-sysv 245.4-4ubuntu3.13 amd64
+systemd-timesyncd 245.4-4ubuntu3.13 amd64
-udev 245.4-4ubuntu3.11 amd64
+udev 245.4-4ubuntu3.13 amd64
---

diff --git a/dhcp/dhclient-enter-hooks.d/resolved b/dhcp/dhclient-enter-hooks.d/resolved
index 8e4f15006..870ea76ef 100755
--- a/dhcp/dhclient-enter-hooks.d/resolved
+++ b/dhcp/dhclient-enter-hooks.d/resolved
@@ -57,6 +57,10 @@ EOF
               newstate="$(mktemp)"
               md5sum $statedir/isc-dhcp-v4-$interface.conf $statedir/isc-dhcp-v6-$interface.conf > $newstate 2> /dev/null
               if ! cmp --quiet $oldstate $newstate; then
+                  # We need to reset-failed to reset the start limit counter,
+                  # in case we're processing more than StartLimitBurst interfaces
+                  # LP: #1939255
+                  systemctl reset-failed systemd-resolved.service
                   systemctl try-reload-or-restart systemd-resolved.service
               fi