]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: move debian/ubuntu ignore preset to config directory
authorLuca Boccassi <bluca@debian.org>
Mon, 24 Apr 2023 09:46:39 +0000 (10:46 +0100)
committerLuca Boccassi <bluca@debian.org>
Mon, 24 Apr 2023 09:46:39 +0000 (10:46 +0100)
mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/systemd/system-preset/99-ignore.preset [new file with mode: 0644]
mkosi.postinst

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 (file)
index 0000000..43f2553
--- /dev/null
@@ -0,0 +1 @@
+ignore *
index 279fe6c99ef02196b5482a83d7a715f3de1e1a60..82c23cf87a64b4a13b9e311a6557d807747e0b6c 100755 (executable)
@@ -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