diff --git a/CHANGELOG.md b/CHANGELOG.md index e2c126af..3191dfdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - `wwctl overlay edit` again writes temporary files to the default location. (After #1886 better resolves the underlying issue from #1473.) #1946 - Prevent brp-mangle-shebangs from changing files in overlays. +- The NetworkManager overlay now only adds an `[ethernet]` section for ethernet interfaces. ### Fixed @@ -31,6 +32,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fixed `wwclient --debug` to properly enable debug logging. - Updated golang BuildRequires in RPM specfile. #1990 +### Changed + +### Fixed + ## v4.6.3, 2025-08-01 ### Added diff --git a/overlays/NetworkManager/internal/networkmanager_test.go b/overlays/NetworkManager/internal/networkmanager_test.go index f9db63e0..79bacd73 100644 --- a/overlays/NetworkManager/internal/networkmanager_test.go +++ b/overlays/NetworkManager/internal/networkmanager_test.go @@ -259,7 +259,6 @@ id=tagged interface-name=eth0.902 type=vlan autoconnect=true -[ethernet] [ipv4] method=manual route1=192.168.1.0/24,192.168.2.254 @@ -331,7 +330,6 @@ miimon=100 mode=balance-rr xmit_hash_policy=layer2+3 updelay=0 -[ethernet] [ipv4] method=manual address=192.168.3.110/24 diff --git a/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww b/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww index 2586837b..4855a94d 100644 --- a/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww +++ b/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww @@ -29,7 +29,7 @@ transport-mode=datagram {{- if $netdev.MTU }} mtu={{ $netdev.MTU }} {{- end }} -{{- else }} +{{- else if eq (default "ethernet" (lower $netdev.Type)) "ethernet" }} [ethernet] {{- if $netdev.Hwaddr }} mac-address={{ $netdev.Hwaddr }}