diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-04-15 18:51:28 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-04-15 21:06:32 +0200 |
| commit | 23603bc67f86384a037b287f66b13db6482feafe (patch) | |
| tree | e8eac7849d1a04f83288b06da5ee0333d658e0d0 | |
| parent | 5739271000b7faa72dfa3aa8005bbaf4d1869f80 (diff) | |
| download | systemd-23603bc67f86384a037b287f66b13db6482feafe.tar.gz | |
mkosi: Always disable sshd, dnsmasq and isc-dhcp-server
| -rw-r--r-- | mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset | 6 | ||||
| -rwxr-xr-x | mkosi.postinst | 5 |
2 files changed, 6 insertions, 5 deletions
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 0000000000..e21493123c --- /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 b84f034235..5aad60f97d 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 \ |