From 1888f28f057ac44b59d645a1348ee525cda4a29f Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Tue, 12 Mar 2024 13:45:15 -0600 Subject: [PATCH 1/3] Fix a formatting error hiding GRUB configuration Signed-off-by: Jonathon Anderson --- userdocs/contents/boot-management.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdocs/contents/boot-management.rst b/userdocs/contents/boot-management.rst index 1bfa83e6e..79cc3c302 100644 --- a/userdocs/contents/boot-management.rst +++ b/userdocs/contents/boot-management.rst @@ -64,7 +64,7 @@ scenarios. In order to enable the grub boot method it has to be enabled in `warewulf.conf`. -.. code-block: yaml +.. code-block:: yaml warewulf: grubboot: true From 280a26d94fc12e420d32c3192c9b44df0b4708f7 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Tue, 12 Mar 2024 13:50:21 -0600 Subject: [PATCH 2/3] Fix changelog from previous commits Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eaf9964f..ee2a72f35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,11 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add the ability to boot nodes with `wwid=[interface]`, which replaces `interface` with the interface MAC address - -## [4.5.0] 2024-02-08 - -### Added - - Added https://github.com/Masterminds/sprig functions to templates #1030 ### Changed @@ -33,11 +28,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [4.5.0] 2024-02-08 -- Official v4.5.0 release. +Official v4.5.0 release. + +### Added + - Publish v4.5.x documentation separately from `main`. #919 -- Fix `Requires: ipxe-botimgs` for building an Enterprise Linux 7 RPM. #1126 - Update quickstart for Enterprise Linux. #394, #401, #977 +### Fixed + +- Fix `Requires: ipxe-botimgs` for building an Enterprise Linux 7 RPM. #1126 + ## [4.5.0rc2] 2024-02-21 ### Fixed From 5e686fec438599b46b55fe890bb74480fd552afc Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Tue, 12 Mar 2024 13:53:20 -0600 Subject: [PATCH 3/3] Update changelog Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee2a72f35..93dbb61fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [4.5.x] +## [4.5.x] (unreleased) ### Added @@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Locally defined `tr` has been dropped, templates updated to use Sprig replace. -- Updated the glossary #819 +- Updated the glossary. #819 ### Fixed @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Systems with no SMBIOS (Raspberry Pi) will create a UUID from `/sys/firmware/devicetree/base/serial-number` - Fix `wwctl profile list -a` format when kernerargs are set +- Fix a rendering bug in the documentation for GRUB boot support. #1132 ## [4.5.0] 2024-02-08