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 f49ab70cf8e268494877b1701dc7365d7c1c0e8e..441068914e4963629bc912fb44077a29063b25f5 100644 (file)
--- 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 5a829b8995c527dd001e17fd14e136eb279c08b8..bf67c94f14fddd42b5881c45795e54318a7730ab 100644 (file)
--- 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.