From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 7 Dec 2023 14:11:33 +0000 (+0100)
Subject: Make sure networking works on debian
X-Git-Tag: v20~105^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=227dde2b301d5608cf2823eb072c00d10db7514f;p=thirdparty%2Fmkosi.git

Make sure networking works on debian

Also drop some unused stuff from the preset file.
---

diff --git a/mkosi.conf.d/20-debian.conf b/mkosi.conf.d/20-debian.conf
index f49ab70cf..441068914 100644
--- a/mkosi.conf.d/20-debian.conf
+++ b/mkosi.conf.d/20-debian.conf
@@ -45,6 +45,7 @@ Packages=
         systemd
         systemd-boot
         systemd-container
+        systemd-resolved
         systemd-sysv
         tar
         tzdata
diff --git a/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset b/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset
index 5a829b899..bf67c94f1 100644
--- a/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset
+++ b/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset
@@ -4,20 +4,13 @@
 disable ssh.service
 disable sshd.service
 
-# These might get pulled in as dependencies but we don't want them running.
-disable dnsmasq.service
-disable isc-dhcp-server.service
-disable isc-dhcp-server6.service
-
-# Pulled in via dracut-network by kexec-tools on Fedora.
-disable NetworkManager*
-
 # Make sure dbus-broker is started by default on Debian/Ubuntu.
 enable dbus-broker.service
 
-# systemd-networkd is disabled by default on Fedora so make sure it is enabled.
+# Make sure we have networking available.
 enable systemd-networkd.service
 enable systemd-networkd-wait-online.service
+enable systemd-resolved.service
 
 # We install dnf in some images but it's only going to be used rarely,
 # so let's not have dnf create its cache.