Bug#1032937: nmu diff

[Bastian Blank]

Control: tags -1 pending

Hi

I intend to NMU this today.  It changes global config without any
knowledge if it might work.

diff -Nru systemd-253/debian/changelog systemd-253/debian/changelog
--- systemd-253/debian/changelog	2023-02-15 21:36:32.000000000 +0100
+++ systemd-253/debian/changelog	2023-03-19 11:54:54.000000000 +0100
@@ -1,3 +1,10 @@
+systemd (253-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove broken resolv.conf setup.  (closes: #1032937)
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 19 Mar 2023 11:54:54 +0100
+
 systemd (253-1) experimental; urgency=medium
 
   * New upstream version 253. For a full list of changes, see:
diff -Nru systemd-253/debian/systemd-resolved.postinst systemd-253/debian/systemd-resolved.postinst
--- systemd-253/debian/systemd-resolved.postinst	2023-02-09 15:56:44.000000000 +0100
+++ systemd-253/debian/systemd-resolved.postinst	2023-03-19 11:54:50.000000000 +0100
@@ -23,14 +23,4 @@
     _adopt_conffile "${DPKG_ROOT}/etc/systemd/resolved.conf" systemd-resolved
 fi
 
-if [ "$1" = configure ] && dpkg --compare-versions "$2" lt 251.4-2; then
-    if [ "$(readlink "${DPKG_ROOT}/etc/resolv.conf")" != "../run/systemd/resolve/stub-resolv.conf" ] && [ "$(readlink "${DPKG_ROOT}/etc/resolv.conf")" != "/run/systemd/resolve/stub-resolv.conf" ]; then
-        echo "Converting /etc/resolv.conf to a symlink to /run/systemd/resolve/stub-resolv.conf..."
-        if [ -f "${DPKG_ROOT}/etc/resolv.conf" ]; then
-            mv "${DPKG_ROOT}/etc/resolv.conf" "${DPKG_ROOT}/etc/.resolv.conf.systemd-resolved.bak" || echo "Cannot take a backup of /etc/resolv.conf."
-        fi
-        ln -sf ../run/systemd/resolve/stub-resolv.conf "${DPKG_ROOT}/etc/resolv.conf" || echo "Cannot install symlink from /etc/resolv.conf to ../run/systemd/resolve/stub-resolv.conf"
-    fi
-fi
-
 #DEBHELPER#

Bastian

-- 
Time is fluid ... like a river with currents, eddies, backwash.
		-- Spock, "The City on the Edge of Forever", stardate 3134.0