Merge pull request #27367 from bluca/mkosi_resolve

mkosi: add tmpfiles to handle locale/resolve.conf in Debian

mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/systemd/system-preset/99-ignore.preset

@@ -0,0 +1 @@
+ignore *

mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/tmpfiles.d/locale.conf

@@ -0,0 +1 @@
+L /etc/default/locale - - - - ../locale.conf

mkosi.postinst

@@ -63,11 +63,6 @@ if [ -n "$IMAGE_VERSION" ] ; then
         /usr/lib/os-release
 fi
 
-# Install a default ignore preset on Debian until it is shipped by Debian itself.
-if grep -q -e "ID=debian" -e "ID_LIKE=debian" /etc/os-release; then
-    echo "ignore *" >/usr/lib/systemd/system-preset/99-ignore.preset
-fi
-
 if command -v authselect >/dev/null; then
     authselect select minimal
 
@@ -75,3 +70,6 @@ if command -v authselect >/dev/null; then
         authselect enable-feature with-homed
     fi
 fi
+
+# Let tmpfiles.d/systemd-resolve.conf handle the symlink
+rm -f /etc/resolv.conf