From e21c266ded998c3553b397967e1f63ddb621ed86 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Wed, 18 Sep 2024 14:04:44 -0600 Subject: [PATCH 1/3] Add autoconnect / onboot support to NetworkManager Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 1 + .../rootfs/etc/NetworkManager/system-connections/ww4-managed.ww | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cadff4cd..da14af18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix autodetected kernel sorting issue. #1332 - Avoid panic on container import #1244 - make sure that warewulfd has the permission 0755 at creation time #674 +- Fix "onboot" behavior for NetworkManager. #1278 ## v4.5.7, 2024-09-11 diff --git a/overlays/wwinit/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww b/overlays/wwinit/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww index ea570d2e..8c77a93b 100644 --- a/overlays/wwinit/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww +++ b/overlays/wwinit/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww @@ -20,7 +20,7 @@ master={{ $master }} type=ethernet {{ else }} type={{ $netdev.Type }} -autoconnect=true +autoconnect={{ $netdev.OnBoot }} {{ end -}} {{ end -}} From f88f3507baf2148d173d2013de6bbab879410c99 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Wed, 18 Sep 2024 19:00:09 -0600 Subject: [PATCH 2/3] Add autoconnect / onboot support to Debian networking Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 2 +- .../etc/network/interfaces.d/default.ww | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da14af18..52e0d9e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,7 +63,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix autodetected kernel sorting issue. #1332 - Avoid panic on container import #1244 - make sure that warewulfd has the permission 0755 at creation time #674 -- Fix "onboot" behavior for NetworkManager. #1278 +- Fix "onboot" behavior for NetworkManager and Debian networking. #1278 ## v4.5.7, 2024-09-11 diff --git a/overlays/wwinit/rootfs/etc/network/interfaces.d/default.ww b/overlays/wwinit/rootfs/etc/network/interfaces.d/default.ww index 2d17b0d2..1981837b 100644 --- a/overlays/wwinit/rootfs/etc/network/interfaces.d/default.ww +++ b/overlays/wwinit/rootfs/etc/network/interfaces.d/default.ww @@ -1,19 +1,21 @@ {{- $host := .BuildHost }} {{- $time := .BuildTime }} {{- $source := .BuildSource }} -{{range $devname, $netdev := .NetDevs -}} +{{range $devname, $netdev := .ThisNode.NetDevs -}} {{- $filename := print $devname }} {{- file $filename }} # This file is autogenerated by warewulf # Host: {{ $host }} # Time: {{ $time }} # Source: {{ $source }} -auto {{$netdev.Device}} -allow-hotplug {{$netdev.Device}} -iface {{$netdev.Device}} inet static - address {{$netdev.Ipaddr}} - netmask {{$netdev.Netmask}} - gateway {{$netdev.Gateway}} - mtu {{$netdev.MTU}} - up ifmetric {{$netdev.Device}} 30 +{{ if $netdev.OnBoot.GetB -}} +auto {{$netdev.Device.Get}} +{{ end -}} +allow-hotplug {{$netdev.Device.Get}} +iface {{$netdev.Device.Get}} inet static + address {{$netdev.Ipaddr.Get}} + netmask {{$netdev.Netmask.Get}} + gateway {{$netdev.Gateway.Get}} + mtu {{$netdev.MTU.Get}} + up ifmetric {{$netdev.Device.Get}} 30 {{- end}} From 216b55af073bbfcbf971ad297a065cb01b16c878 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Sat, 21 Sep 2024 02:13:35 -0600 Subject: [PATCH 3/3] Add autoconnect / onboot support to Suse wicked Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 2 +- .../rootfs/etc/wicked/ifconfig/ifcfg.xml.ww | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52e0d9e3..4bc82846 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,7 +63,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix autodetected kernel sorting issue. #1332 - Avoid panic on container import #1244 - make sure that warewulfd has the permission 0755 at creation time #674 -- Fix "onboot" behavior for NetworkManager and Debian networking. #1278 +- Fix "onboot" behavior for NetworkManager, Debian networking, and Suse wicked. #1278 ## v4.5.7, 2024-09-11 diff --git a/overlays/wwinit/rootfs/etc/wicked/ifconfig/ifcfg.xml.ww b/overlays/wwinit/rootfs/etc/wicked/ifconfig/ifcfg.xml.ww index 1afb0ea8..d40663f1 100644 --- a/overlays/wwinit/rootfs/etc/wicked/ifconfig/ifcfg.xml.ww +++ b/overlays/wwinit/rootfs/etc/wicked/ifconfig/ifcfg.xml.ww @@ -1,7 +1,7 @@ {{- $host := .BuildHost }} {{- $time := .BuildTime }} {{- $source := .BuildSource }} -{{range $devname, $netdev := .NetDevs -}} +{{range $devname, $netdev := .ThisNode.NetDevs -}} {{- $filename := print "ifcfg-" $devname ".xml" }} {{- file $filename }} - {{$netdev.Device}} - {{ if $netdev.Type -}} - {{ $netdev.Type }} + {{$netdev.Device.Get}} + {{ if $netdev.Type.Get -}} + {{ $netdev.Type.Get }} {{ end -}} - {{ if $netdev.MTU -}} - {{ $netdev.MTU }} + {{ if $netdev.MTU.Get -}} + {{ $netdev.MTU.Get }} {{ end -}} - boot + {{ if $netdev.OnBoot.GetB -}}boot{{ else }}manual{{end}} @@ -29,12 +29,12 @@ Source: {{ $source }}
- {{$netdev.IpCIDR}} + {{$netdev.IpCIDR.Get}}
-{{ if $netdev.Gateway -}} +{{ if $netdev.Gateway.Get -}} - {{$netdev.Gateway}} + {{$netdev.Gateway.Get}} {{ end -}} @@ -44,10 +44,10 @@ Source: {{ $source }} prefer-public false -{{ if $netdev.Ipaddr6 -}} +{{ if $netdev.Ipaddr6.Get -}}
- {{ $netdev.Ipaddr6 }} + {{ $netdev.Ipaddr6.Get }}
{{ end -}}