From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 15 Apr 2023 16:51:28 +0000 (+0200)
Subject: mkosi: Always disable sshd, dnsmasq and isc-dhcp-server
X-Git-Tag: v254-rc1~709
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23603bc67f86384a037b287f66b13db6482feafe;p=thirdparty%2Fsystemd.git

mkosi: Always disable sshd, dnsmasq and isc-dhcp-server
---

diff --git a/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset b/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset
new file mode 100644
index 00000000000..e21493123c5
--- /dev/null
+++ b/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+disable ssh.service
+disable sshd.service
+disable dnsmasq.service
+disable isc-dhcp-server.service
+disable isc-dhcp-server6.service
diff --git a/mkosi.postinst b/mkosi.postinst
index b84f0342355..5aad60f97d9 100755
--- a/mkosi.postinst
+++ b/mkosi.postinst
@@ -47,11 +47,6 @@ EOF
     systemctl mask systemd-hwdb-update.service
 fi
 
-# Make sure dnsmasq doesn't start on boot on Debian/Ubuntu.
-systemctl disable dnsmasq
-# Make sure sshd doesn't start on Opensuse.
-echo "disable sshd.service" > /usr/lib/systemd/system-preset/00-mkosi.preset
-
 if [ -n "$IMAGE_ID" ] ; then
     sed -n \
         -i \