Fix grub asset key handling
Signed-off-by: Elmar Pruesse <pruessee@njhealth.org>
This commit is contained in:
committed by
Christian Goll
parent
ee734d28ab
commit
097fbbc82a
@@ -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" {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user