Merge pull request #79 from OSInside/ubuntu-box-systemd-network-resolve

boxes: ubuntu: switch to using systemd-networkd and systemd-resolved
OSInside · Jan 18, 2025 · 2f2cf4a · 2f2cf4a
2 parents c0189cd + 8303d93
commit 2f2cf4a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 18 deletions.
diff --git a/boxes/ubuntu/appliance.kiwi b/boxes/ubuntu/appliance.kiwi
@@ -64,13 +64,13 @@
         <package name="syslinux" arch="x86_64"/>
         <package name="syslinux-common" arch="x86_64"/>
         <package name="systemd"/>
+        <package name="systemd-resolved"/>
         <package name="dracut"/>
         <package name="init"/>
         <package name="gnupg"/>
         <package name="iproute2"/>
         <package name="iptables"/>
         <package name="iputils-ping"/>
-        <package name="ifupdown"/>
         <package name="isc-dhcp-client"/>
         <package name="netbase"/>
         <package name="dbus"/>

diff --git a/boxes/ubuntu/config.sh b/boxes/ubuntu/config.sh
@@ -34,6 +34,7 @@ systemctl disable lvm2-lvmetad.socket
 systemctl mask lvm2-lvmetad.socket
 
 #======================================
-# Enable firstboot resolv.conf setting
+# Enable systemd networking services
 #--------------------------------------
-baseInsertService symlink-resolvconf
+baseInsertService systemd-networkd
+baseInsertService systemd-resolved
diff --git a/boxes/ubuntu/root/etc/network/interfaces.d/lan0 b/boxes/ubuntu/root/etc/network/interfaces.d/lan0
diff --git a/boxes/ubuntu/root/etc/systemd/network/lan0.network b/boxes/ubuntu/root/etc/systemd/network/lan0.network
@@ -0,0 +1,5 @@
+[Match]
+Name=lan0
+
+[Network]
+DHCP=Yes
diff --git a/boxes/ubuntu/root/etc/systemd/system/symlink-resolvconf.service b/boxes/ubuntu/root/etc/systemd/system/symlink-resolvconf.service