From 82b276f8586622e9f2ef06a3323636b8c8e7d863 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Thu, 30 Dec 2021 03:44:48 +0000 Subject: [PATCH 1/2] Implement fix for #222 (thanks Griznog!) --- etc/ipxe/default.ipxe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/ipxe/default.ipxe b/etc/ipxe/default.ipxe index 543797f8..7b419cb3 100644 --- a/etc/ipxe/default.ipxe +++ b/etc/ipxe/default.ipxe @@ -12,9 +12,9 @@ echo set base http://{{.Ipaddr}}:{{.Port}} kernel --name kernel ${base}/kernel/{{.Hwaddr}} || goto reboot -initrd --name container ${base}/container/{{.Hwaddr}} || goto reboot -initrd --name kmods ${base}/kmods/{{.Hwaddr}} || goto reboot -initrd --name system ${base}/overlay-system/{{.Hwaddr}} || goto reboot +imgextract --name container ${base}/container/{{.Hwaddr}} || goto reboot +imgextract --name kmods ${base}/kmods/{{.Hwaddr}} || goto reboot +imgextract --name system ${base}/overlay-system/{{.Hwaddr}} || goto reboot boot kernel initrd=container initrd=kmods initrd=system {{.KernelArgs}} || goto reboot From a0ffc12c9a496e2c300a3583ed399479c7290d01 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Thu, 30 Dec 2021 17:22:56 +0000 Subject: [PATCH 2/2] Put `imgextract` into a different PXE file until it is tested on ARM To use this iPXE template do the following: ``` wwctl profile set --ipxe big_image default ``` --- etc/ipxe/big_image.ipxe | 26 ++++++++++++++++++++++++++ etc/ipxe/default.ipxe | 6 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 etc/ipxe/big_image.ipxe diff --git a/etc/ipxe/big_image.ipxe b/etc/ipxe/big_image.ipxe new file mode 100644 index 00000000..a3f9bda0 --- /dev/null +++ b/etc/ipxe/big_image.ipxe @@ -0,0 +1,26 @@ +#!ipxe + +echo +echo ================================================================================ +echo Warewulf v4 now booting: {{.Fqdn}} +echo +echo Container: {{.ContainerName}} +echo Kernel: {{.KernelVersion}} +echo KernelArgs: {{.KernelArgs}} +echo + +set base http://{{.Ipaddr}}:{{.Port}} + +kernel --name kernel ${base}/kernel/{{.Hwaddr}} || goto reboot +imgextract --name container ${base}/container/{{.Hwaddr}} || goto reboot +imgextract --name kmods ${base}/kmods/{{.Hwaddr}} || goto reboot +imgextract --name system ${base}/overlay-system/{{.Hwaddr}} || goto reboot + +boot kernel initrd=container initrd=kmods initrd=system {{.KernelArgs}} || goto reboot + +:reboot +echo +echo There was an error, rebooting in 15s... +echo +sleep 15 +reboot diff --git a/etc/ipxe/default.ipxe b/etc/ipxe/default.ipxe index 7b419cb3..543797f8 100644 --- a/etc/ipxe/default.ipxe +++ b/etc/ipxe/default.ipxe @@ -12,9 +12,9 @@ echo set base http://{{.Ipaddr}}:{{.Port}} kernel --name kernel ${base}/kernel/{{.Hwaddr}} || goto reboot -imgextract --name container ${base}/container/{{.Hwaddr}} || goto reboot -imgextract --name kmods ${base}/kmods/{{.Hwaddr}} || goto reboot -imgextract --name system ${base}/overlay-system/{{.Hwaddr}} || goto reboot +initrd --name container ${base}/container/{{.Hwaddr}} || goto reboot +initrd --name kmods ${base}/kmods/{{.Hwaddr}} || goto reboot +initrd --name system ${base}/overlay-system/{{.Hwaddr}} || goto reboot boot kernel initrd=container initrd=kmods initrd=system {{.KernelArgs}} || goto reboot