From 7cd64af54db0776176275f77ed769f5022616aac Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 23 Apr 2023 13:02:06 +0100 Subject: [PATCH 1/4] mkosi: delete /etc/resolv.conf to let tmpfiles handle it In case the distribution creates or ships resolv.conf, delete it and let tmpfiles handle it --- mkosi.postinst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mkosi.postinst b/mkosi.postinst index a71878b9397..279fe6c99ef 100755 --- a/mkosi.postinst +++ b/mkosi.postinst @@ -75,3 +75,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 From 6f9b70fc6913619f30c4ac34061ae52a21f95a36 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 23 Apr 2023 12:54:20 +0100 Subject: [PATCH 2/4] mkosi: move debian/ubuntu common conf under common directory --- .../{20-debian-ubuntu.conf => 20-debian-ubuntu/mkosi.conf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mkosi.conf.d/{20-debian-ubuntu.conf => 20-debian-ubuntu/mkosi.conf} (100%) diff --git a/mkosi.conf.d/20-debian-ubuntu.conf b/mkosi.conf.d/20-debian-ubuntu/mkosi.conf similarity index 100% rename from mkosi.conf.d/20-debian-ubuntu.conf rename to mkosi.conf.d/20-debian-ubuntu/mkosi.conf From 0b5382ed03bd0de6fc188e09b6c3cbf6034ea706 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 24 Apr 2023 10:46:39 +0100 Subject: [PATCH 3/4] 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 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 From 48df882c7ff505a0e47e88e0d6aac95326bfa54f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 24 Apr 2023 10:47:29 +0100 Subject: [PATCH 4/4] mkosi: add tmpfiles to create debian/ubuntu /etc/default/locale link --- .../20-debian-ubuntu/mkosi.extra/usr/lib/tmpfiles.d/locale.conf | 1 + 1 file changed, 1 insertion(+) create mode 100644 mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/tmpfiles.d/locale.conf diff --git a/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/tmpfiles.d/locale.conf b/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/tmpfiles.d/locale.conf new file mode 100644 index 00000000000..e1a8e8171ac --- /dev/null +++ b/mkosi.conf.d/20-debian-ubuntu/mkosi.extra/usr/lib/tmpfiles.d/locale.conf @@ -0,0 +1 @@ +L /etc/default/locale - - - - ../locale.conf