Omit initrd=runtime if not loaded

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-11-13 22:20:26 -07:00
parent c6ebac89da
commit cab56fbea5

View File

@@ -37,7 +37,7 @@ echo Downloading System Overlay:
imgextract --name system ${uri_base}&stage=system&compress=gz || goto reboot imgextract --name system ${uri_base}&stage=system&compress=gz || goto reboot
echo Downloading Runtime Overlay: echo Downloading Runtime Overlay:
imgextract --name runtime ${uri_base}&stage=runtime&compress=gz || echo Failed downloading runtime overlay. imgextract --name runtime ${uri_base}&stage=runtime&compress=gz && set runtime_initrd initrd=runtime || echo Failed downloading runtime overlay.
{{if ne .KernelOverride "" -}} {{if ne .KernelOverride "" -}}
echo Downloading Kernel Modules: echo Downloading Kernel Modules:
@@ -58,7 +58,7 @@ echo Downloading System Overlay:
initrd --name system ${uri_base}&stage=system || goto reboot initrd --name system ${uri_base}&stage=system || goto reboot
echo Downloading Runtime Overlay: echo Downloading Runtime Overlay:
initrd --name runtime ${uri_base}&stage=runtime || echo Failed downloading runtime overlay. initrd --name runtime ${uri_base}&stage=runtime && set runtime_initrd initrd=runtime || echo Failed downloading runtime overlay.
{{if ne .KernelOverride "" -}} {{if ne .KernelOverride "" -}}
echo Downloading Kernel Modules: echo Downloading Kernel Modules:
@@ -79,7 +79,7 @@ echo Downloading System Overlay:
initrd --name system ${uri_base}&stage=system&compress=gz || goto reboot initrd --name system ${uri_base}&stage=system&compress=gz || goto reboot
echo Downloading Runtime Overlay: echo Downloading Runtime Overlay:
initrd --name runtime ${uri_base}&stage=runtime&compress=gz || echo Failed downloading runtime overlay. initrd --name runtime ${uri_base}&stage=runtime&compress=gz && set runtime_initrd initrd=runtime || echo Failed downloading runtime overlay.
{{if ne .KernelOverride "" -}} {{if ne .KernelOverride "" -}}
echo Downloading Kernel Modules: echo Downloading Kernel Modules:
@@ -90,11 +90,11 @@ initrd --name kmods ${uri_base}&stage=kmods&compress=gz || goto reboot
:imoktogo :imoktogo
{{if ne .KernelOverride "" -}} {{if ne .KernelOverride "" -}}
echo boot kernel initrd=container initrd=kmods initrd=system initrd=runtime wwid={{.Hwaddr}} {{.KernelArgs}} echo boot kernel initrd=container initrd=kmods initrd=system ${runtime_initrd} wwid={{.Hwaddr}} {{.KernelArgs}}
boot kernel initrd=container initrd=kmods initrd=system initrd=runtime wwid={{.Hwaddr}} {{.KernelArgs}} || goto reboot boot kernel initrd=container initrd=kmods initrd=system ${runtime_initrd} wwid={{.Hwaddr}} {{.KernelArgs}} || goto reboot
{{- else -}} {{- else -}}
echo boot kernel initrd=container initrd=system initrd=runtime wwid={{.Hwaddr}} {{.KernelArgs}} echo boot kernel initrd=container initrd=system ${runtime_initrd} wwid={{.Hwaddr}} {{.KernelArgs}}
boot kernel initrd=container initrd=system initrd=runtime wwid={{.Hwaddr}} {{.KernelArgs}} || goto reboot boot kernel initrd=container initrd=system ${runtime_initrd} wwid={{.Hwaddr}} {{.KernelArgs}} || goto reboot
{{- end}} {{- end}}
:reboot :reboot