diff --git a/CHANGELOG.md b/CHANGELOG.md index 378325b0..3f426030 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Support Ubuntu-style dracut initrd images. +### Changed + +- Match default kernel arguments from `wwctl upgrade nodes` with the distributed `nodes.conf`. + ### Fixed - Fix nightly builds. diff --git a/internal/pkg/upgrade/node.go b/internal/pkg/upgrade/node.go index 46cf5d63..3e8fa26f 100644 --- a/internal/pkg/upgrade/node.go +++ b/internal/pkg/upgrade/node.go @@ -123,7 +123,7 @@ func (legacy *NodesYaml) Upgrade(addDefaults bool, replaceOverlays bool, warewul defaultProfile.RuntimeOverlay, genericSplitOverlays...) } if len(defaultProfile.Kernel.Args) < 1 { - defaultProfile.Kernel.Args = []string{"quiet", "crashkernel=no", "vga=791", "net.naming-scheme=v238"} + defaultProfile.Kernel.Args = []string{"quiet", "crashkernel=no"} } if defaultProfile.Init == "" { defaultProfile.Init = "/sbin/init" diff --git a/internal/pkg/upgrade/node_test.go b/internal/pkg/upgrade/node_test.go index fa04fea5..132b109b 100644 --- a/internal/pkg/upgrade/node_test.go +++ b/internal/pkg/upgrade/node_test.go @@ -576,8 +576,6 @@ nodeprofiles: args: - quiet - crashkernel=no - - vga=791 - - net.naming-scheme=v238 init: /sbin/init root: initramfs resources: @@ -656,8 +654,6 @@ nodeprofiles: args: - quiet - crashkernel=no - - vga=791 - - net.naming-scheme=v238 init: /sbin/init root: initramfs resources: @@ -919,8 +915,6 @@ nodeprofiles: args: - quiet - crashkernel=no - - vga=791 - - net.naming-scheme=v238 init: /sbin/init root: initramfs resources: