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 (file)
index 0000000..e214931
--- /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 b84f034235573ee7ce3dd93caa39e74964c888c6..5aad60f97d90acc533b7d2cebabdd02b1730097c 100755 (executable)
--- 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 \