From 0b5382ed03bd0de6fc188e09b6c3cbf6034ea706 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 24 Apr 2023 10:46:39 +0100 Subject: [PATCH] mkosi: move debian/ubuntu ignore preset to config directory --- .../usr/lib/systemd/system-preset/99-ignore.preset | 1 + mkosi.postinst | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) create mode 100644 mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/systemd/system-preset/99-ignore.preset 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 0000000000..43f25533d1 --- /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 279fe6c99e..82c23cf87a 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 -- 2.25.1