From eb9a20fa01627399d71870d8e44e11a3be2f481c Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Wed, 19 Mar 2025 16:05:02 +0100 Subject: [PATCH] fix SUSE specific udev regression Signed-off-by: Christian Goll --- CHANGELOG.md | 1 + etc/nodes.conf | 1 + internal/pkg/upgrade/node.go | 2 +- internal/pkg/upgrade/node_test.go | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6628d0f6..933a547c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - wwclient uses `WW_IPADDR`, if set, to contact the Warewulf server. #1788 - Add `wwctl node import --yes` to assume yes to confirmations. - Set an IPMI tag ``vlan`` to configure the vlan during ``ipmiwrite``. #1031 +- Added net.ifnames=1 to default kernel argument list. #1820 ### Fixed diff --git a/etc/nodes.conf b/etc/nodes.conf index c5b9487f..94eeb9ee 100644 --- a/etc/nodes.conf +++ b/etc/nodes.conf @@ -23,6 +23,7 @@ nodeprofiles: args: - quiet - crashkernel=no + - net.ifnames=1 init: /sbin/init root: initramfs ipxe template: default diff --git a/internal/pkg/upgrade/node.go b/internal/pkg/upgrade/node.go index d071d451..4bdab94f 100644 --- a/internal/pkg/upgrade/node.go +++ b/internal/pkg/upgrade/node.go @@ -126,7 +126,7 @@ func (legacy *NodesYaml) Upgrade(addDefaults bool, replaceOverlays bool, warewul defaultProfile.Kernel = new(node.KernelConf) } if len(defaultProfile.Kernel.Args) < 1 { - defaultProfile.Kernel.Args = []string{"quiet", "crashkernel=no"} + defaultProfile.Kernel.Args = []string{"quiet", "crashkernel=no", "net.ifnames=1"} } if defaultProfile.Init == "" { defaultProfile.Init = "/sbin/init" diff --git a/internal/pkg/upgrade/node_test.go b/internal/pkg/upgrade/node_test.go index 6b655af2..5f476b10 100644 --- a/internal/pkg/upgrade/node_test.go +++ b/internal/pkg/upgrade/node_test.go @@ -578,6 +578,7 @@ nodeprofiles: args: - quiet - crashkernel=no + - net.ifnames=1 init: /sbin/init root: initramfs resources: @@ -658,6 +659,7 @@ nodeprofiles: args: - quiet - crashkernel=no + - net.ifnames=1 init: /sbin/init root: initramfs resources: @@ -1014,6 +1016,7 @@ nodeprofiles: args: - quiet - crashkernel=no + - net.ifnames=1 init: /sbin/init root: initramfs resources: