From 8c4996cce7447e6e186c54e20c5c6fcde6d373bc Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Fri, 11 Apr 2025 18:00:51 -0600 Subject: [PATCH] server: provide network config direct to netplan --- .../etc/cloud/cloud.cfg | 14 -------------- .../etc/netplan/00-installer-config.yaml | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/netplan/00-installer-config.yaml diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/cloud/cloud.cfg b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/cloud/cloud.cfg index e9571afd..0ec5aeba 100644 --- a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/cloud/cloud.cfg +++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/cloud/cloud.cfg @@ -18,20 +18,6 @@ ssh_pwauth: yes chpasswd: expire: false -# This is the initial network config. -# It can be overwritten by cloud-init or subiquity. -network: - version: 2 - ethernets: - zz-all-en: - match: - name: "en*" - dhcp4: true - zz-all-eth: - match: - name: "eth*" - dhcp4: true - # We used to have a custom final_message here. Just use the default instead. # Example datasource config diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/netplan/00-installer-config.yaml b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/netplan/00-installer-config.yaml new file mode 100644 index 00000000..d9eab3af --- /dev/null +++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/netplan/00-installer-config.yaml @@ -0,0 +1,19 @@ +# This is the initial network config. +# It can be overwritten by cloud-init or subiquity. +# For more information, see netplan(5) + +network: + version: 2 + ethernets: + zz-all-en: + match: + name: "en*" + dhcp4: true + dhcp6: true + accept-ra: true + zz-all-eth: + match: + name: "eth*" + dhcp4: true + dhcp6: true + accept-ra: true