From: Luca Boccassi <bluca@debian.org>
Date: Mon, 24 Apr 2023 09:46:39 +0000 (+0100)
Subject: mkosi: move debian/ubuntu ignore preset to config directory
X-Git-Tag: v254-rc1~661^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b5382ed03bd0de6fc188e09b6c3cbf6034ea706;p=thirdparty%2Fsystemd.git

mkosi: move debian/ubuntu ignore preset to config directory
---

diff --git a/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/systemd/system-preset/99-ignore.preset b/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/systemd/system-preset/99-ignore.preset
new file mode 100644
index 00000000000..43f25533d1d
--- /dev/null
+++ b/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/systemd/system-preset/99-ignore.preset
@@ -0,0 +1 @@
+ignore *
diff --git a/mkosi.postinst b/mkosi.postinst
index 279fe6c99ef..82c23cf87a6 100755
--- a/mkosi.postinst
+++ b/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