Merge pull request #1291 from epruesse/grub-assekey-patch

Fix grub asset key handling

CHANGELOG.md

@@ -37,6 +37,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   on unused/unmanaged network interfaces.
 - Systems with no SMBIOS (Raspberry Pi) will create a UUID from
   `/sys/firmware/devicetree/base/serial-number`
+- Grub chainload and main configs correctly extract smbios asset key
+  for node authentication
 - Replace slice in templates with sprig substr. #1093
 - Fix an invalid format issue for the GitHub nightly build action. #1258
 - Return non-zero exit code on overlay build failure #1393

CONTRIBUTORS.md

@@ -37,4 +37,4 @@
 * Tobias Ribizel <mail@ribizel.de>
 * Tobias Poschwatta <poschwatta@zib.de>
 * Josh Burks <jeburks2@asu.edu>
-* Elmar Pruessee <pruessee@njhealth.org>
+* Elmar Pruesse <pruessee@njhealth.org> @epruesse

etc/grub/chainload.ww

@@ -5,14 +5,15 @@
 echo "================================================================================"
 echo "Warewulf v4 now iXPE booting with grub"
 echo "================================================================================"
+smbios --type 3 --get-string 8 --set assetkey
 set timeout=2
 # Must chainload in order to get kernel args for specific node
 menuentry "Load specific configfile" {
-    conf="(http,{{.Ipaddr}}:{{.Warewulf.Port}})/efiboot/grub.cfg"
+    conf="(http,{{.Ipaddr}}:{{.Warewulf.Port}})/efiboot/grub.cfg?assetkey=${assetkey}"
     configfile $conf
 }
 menuentry "Chainload shim of container" {
-    shim="(http,{{.Ipaddr}}:{{.Warewulf.Port}})/efiboot/shim.efi"
+    shim="(http,{{.Ipaddr}}:{{.Warewulf.Port}})/efiboot/shim.efi?assetkey=${assetkey}"
     chainloader ${shim}
 }
 menuentry "UEFI Firmware Settings" --id "uefi-firmware" {

etc/grub/grub.cfg.ww

@@ -6,7 +6,7 @@ echo
 echo "Warewulf Controller: {{.Ipaddr}}"
 echo
 sleep 1
-smbios --type1 --get-string 8 --set assetkey
+smbios --type 3 --get-string 8 --set assetkey
 
 uri="(http,{{.Ipaddr}}:{{.Port}})/provision/${net_default_mac}?assetkey=${assetkey}"
 kernel="${uri}&stage=kernel"
@@ -70,7 +70,7 @@ menuentry "Network boot node with dracut: {{.Id}}" --id dracut {
 }
 
 menuentry "Chainload specific configfile" {
-    conf="(http,{{.Ipaddr}}:{{.Port}})/efiboot/grub.cfg"
+    conf="(http,{{.Ipaddr}}:{{.Port}})/efiboot/grub.cfg?assetkey=${assetkey}"
     configfile $conf
 }