From 580d402b570c625786f7b5a57e86f30ba18bbedf Mon Sep 17 00:00:00 2001 From: griznog Date: Thu, 24 Feb 2022 13:22:50 -0600 Subject: [PATCH] Make displaying the kernel handle the default case when an override is not specified. --- etc/ipxe/bigimage.ipxe | 6 +++++- etc/ipxe/default.ipxe | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/etc/ipxe/bigimage.ipxe b/etc/ipxe/bigimage.ipxe index 7527fbb9..e854f1c0 100644 --- a/etc/ipxe/bigimage.ipxe +++ b/etc/ipxe/bigimage.ipxe @@ -5,7 +5,11 @@ echo =========================================================================== echo Warewulf v4 now booting: {{.Fqdn}} echo echo Container: {{.ContainerName}} -echo Kernel: {{.KernelVersion}} +{{if .KernelOverride }} +echo Kernel: {{.KernelOverride}} +{{else}} +echo Kernel: {{.ContainerName}} (container default) +{{end}} echo KernelArgs: {{.KernelArgs}} echo diff --git a/etc/ipxe/default.ipxe b/etc/ipxe/default.ipxe index ef1d879f..8ebe42a5 100644 --- a/etc/ipxe/default.ipxe +++ b/etc/ipxe/default.ipxe @@ -5,7 +5,11 @@ echo =========================================================================== echo Warewulf v4 now booting: {{.Fqdn}} echo echo Container: {{.ContainerName}} -echo Kernel: {{.KernelVersion}} +{{if .KernelOverride }} +echo Kernel: {{.KernelOverride}} +{{else}} +echo Kernel: {{.ContainerName}} (container default) +{{end}} echo KernelArgs: {{.KernelArgs}} echo