diff --git a/CHANGELOG.md b/CHANGELOG.md index 999525ca..30031ae7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -96,6 +96,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Don't update IPMI if password isn't set. #638 - Fix issue that `--nettagdel` does not work properly. #1503 - Fix test for dhcp static configuration #1536 #1537 +- Fix issue that initrd fails at downloading runtime overlay with permission denied error, + when warewulf secure option in warewulf.conf is enabled. #806 +- Allow iPXE to continue booting without runtime overlay. #806 ## v4.5.8, 2024-10-01 diff --git a/etc/ipxe/default.ipxe b/etc/ipxe/default.ipxe index 10ed5ff2..fa4ed459 100644 --- a/etc/ipxe/default.ipxe +++ b/etc/ipxe/default.ipxe @@ -37,7 +37,7 @@ echo Downloading System Overlay: imgextract --name system ${uri_base}&stage=system&compress=gz || goto reboot echo Downloading Runtime Overlay: -imgextract --name runtime ${uri_base}&stage=runtime&compress=gz || goto reboot +imgextract --name runtime ${uri_base}&stage=runtime&compress=gz && set runtime_initrd initrd=runtime || echo Failed downloading runtime overlay. {{if ne .KernelOverride "" -}} echo Downloading Kernel Modules: @@ -58,7 +58,7 @@ echo Downloading System Overlay: initrd --name system ${uri_base}&stage=system || goto reboot echo Downloading Runtime Overlay: -initrd --name runtime ${uri_base}&stage=runtime || goto reboot +initrd --name runtime ${uri_base}&stage=runtime && set runtime_initrd initrd=runtime || echo Failed downloading runtime overlay. {{if ne .KernelOverride "" -}} echo Downloading Kernel Modules: @@ -79,7 +79,7 @@ echo Downloading System Overlay: initrd --name system ${uri_base}&stage=system&compress=gz || goto reboot echo Downloading Runtime Overlay: -initrd --name runtime ${uri_base}&stage=runtime&compress=gz || goto reboot +initrd --name runtime ${uri_base}&stage=runtime&compress=gz && set runtime_initrd initrd=runtime || echo Failed downloading runtime overlay. {{if ne .KernelOverride "" -}} echo Downloading Kernel Modules: @@ -90,11 +90,11 @@ initrd --name kmods ${uri_base}&stage=kmods&compress=gz || goto reboot :imoktogo {{if ne .KernelOverride "" -}} -echo boot kernel initrd=container initrd=kmods initrd=system initrd=runtime wwid={{.Hwaddr}} {{.KernelArgs}} -boot kernel initrd=container initrd=kmods initrd=system initrd=runtime wwid={{.Hwaddr}} {{.KernelArgs}} || goto reboot +echo boot kernel initrd=container initrd=kmods initrd=system ${runtime_initrd} wwid={{.Hwaddr}} {{.KernelArgs}} +boot kernel initrd=container initrd=kmods initrd=system ${runtime_initrd} wwid={{.Hwaddr}} {{.KernelArgs}} || goto reboot {{- else -}} -echo boot kernel initrd=container initrd=system initrd=runtime wwid={{.Hwaddr}} {{.KernelArgs}} -boot kernel initrd=container initrd=system initrd=runtime wwid={{.Hwaddr}} {{.KernelArgs}} || goto reboot +echo boot kernel initrd=container initrd=system ${runtime_initrd} wwid={{.Hwaddr}} {{.KernelArgs}} +boot kernel initrd=container initrd=system ${runtime_initrd} wwid={{.Hwaddr}} {{.KernelArgs}} || goto reboot {{- end}} :reboot