From: mhoellein <mario@hoellein.online>
Date: Thu, 22 Jul 2021 10:14:19 +0000 (+0200)
Subject: committing changes in /etc made by "apt-get upgrade"
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=a670049b23bc567228bdbb31283c1745e3746566;p=vserver

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

Package changes:
-collaboraoffice6.4 6.4.10.44-44 amd64
-collaboraoffice6.4-ure 6.4.10.44-44 amd64
+collaboraoffice6.4 6.4.10.45-45 amd64
+collaboraoffice6.4-ure 6.4.10.45-45 amd64
-collaboraofficebasis6.4-calc 6.4.10.44-44 amd64
-collaboraofficebasis6.4-core 6.4.10.44-44 amd64
-collaboraofficebasis6.4-draw 6.4.10.44-44 amd64
-collaboraofficebasis6.4-en-us 6.4.10.44-44 amd64
-collaboraofficebasis6.4-extension-pdf-import 6.4.10.44-44 amd64
-collaboraofficebasis6.4-graphicfilter 6.4.10.44-44 amd64
-collaboraofficebasis6.4-images 6.4.10.44-44 amd64
-collaboraofficebasis6.4-impress 6.4.10.44-44 amd64
-collaboraofficebasis6.4-ooofonts 6.4.10.44-44 amd64
-collaboraofficebasis6.4-ooolinguistic 6.4.10.44-44 amd64
-collaboraofficebasis6.4-writer 6.4.10.44-44 amd64
+collaboraofficebasis6.4-calc 6.4.10.45-45 amd64
+collaboraofficebasis6.4-core 6.4.10.45-45 amd64
+collaboraofficebasis6.4-draw 6.4.10.45-45 amd64
+collaboraofficebasis6.4-en-us 6.4.10.45-45 amd64
+collaboraofficebasis6.4-extension-pdf-import 6.4.10.45-45 amd64
+collaboraofficebasis6.4-graphicfilter 6.4.10.45-45 amd64
+collaboraofficebasis6.4-images 6.4.10.45-45 amd64
+collaboraofficebasis6.4-impress 6.4.10.45-45 amd64
+collaboraofficebasis6.4-ooofonts 6.4.10.45-45 amd64
+collaboraofficebasis6.4-ooolinguistic 6.4.10.45-45 amd64
+collaboraofficebasis6.4-writer 6.4.10.45-45 amd64
-libnss-systemd 245.4-4ubuntu3.7 amd64
+libnss-systemd 245.4-4ubuntu3.11 amd64
-libpam-systemd 245.4-4ubuntu3.7 amd64
+libpam-systemd 245.4-4ubuntu3.11 amd64
-libruby2.7 2.7.0-5ubuntu1.4 amd64
+libruby2.7 2.7.0-5ubuntu1.5 amd64
-libsystemd0 245.4-4ubuntu3.7 amd64
+libsystemd0 245.4-4ubuntu3.11 amd64
-libudev1 245.4-4ubuntu3.7 amd64
+libudev1 245.4-4ubuntu3.11 amd64
-linux-libc-dev 5.4.0-77.86 amd64
+linux-libc-dev 5.4.0-80.90 amd64
-loolwsd 6.4.10-4 amd64
+loolwsd 6.4.10-5 amd64
-python-pip-whl 20.0.2-5ubuntu1.5 all
+python-pip-whl 20.0.2-5ubuntu1.6 all
-python3-pip 20.0.2-5ubuntu1.5 all
+python3-pip 20.0.2-5ubuntu1.6 all
-ruby2.7 2.7.0-5ubuntu1.4 amd64
+ruby2.7 2.7.0-5ubuntu1.5 amd64
-systemd 245.4-4ubuntu3.7 amd64
-systemd-sysv 245.4-4ubuntu3.7 amd64
-systemd-timesyncd 245.4-4ubuntu3.7 amd64
+systemd 245.4-4ubuntu3.11 amd64
+systemd-sysv 245.4-4ubuntu3.11 amd64
+systemd-timesyncd 245.4-4ubuntu3.11 amd64
-udev 245.4-4ubuntu3.7 amd64
+udev 245.4-4ubuntu3.11 amd64
---

diff --git a/dhcp/dhclient-enter-hooks.d/resolved b/dhcp/dhclient-enter-hooks.d/resolved
index e3c7ed732..8e4f15006 100755
--- a/dhcp/dhclient-enter-hooks.d/resolved
+++ b/dhcp/dhclient-enter-hooks.d/resolved
@@ -14,7 +14,7 @@
 #   (D) = master script downs interface
 #   (-) = master script does nothing with this
 
-if [ -x /lib/systemd/systemd-resolved ] ; then
+if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then
         # For safety, first undefine the nasty default make_resolv_conf()
         make_resolv_conf() { : ; }
         case "$reason" in