From e4385713e823fd4bd0f9fec57b5a94a851b30ff7 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 5 Jul 2024 12:13:10 -0600 Subject: [PATCH] Port dracut boot refinement to grub Signed-off-by: Jonathon Anderson --- etc/grub/grub.cfg.ww | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/etc/grub/grub.cfg.ww b/etc/grub/grub.cfg.ww index 859d2d51..ae9bedbd 100644 --- a/etc/grub/grub.cfg.ww +++ b/etc/grub/grub.cfg.ww @@ -42,10 +42,7 @@ menuentry "Network boot node: {{.Id}}" --id ww4 { menuentry "Network boot node with dracut: {{.Id}}" --id dracut { initramfs="${uri}&stage=initramfs" - uri="http://{{.Ipaddr}}:{{.Port}}/provision/${net_default_mac}?assetkey=${assetkey}" - container="${uri}&stage=container&compress=gz" - system="${uri}&stage=system&compress=gz" - runtime="${uri}&stage=runtime&compress=gz" + wwinit_uri="http://{{.Ipaddr}}:{{.Port}}/provision/${net_default_mac}?assetkey=${assetkey}" {{if .KernelOverride }} echo "Kernel: {{.KernelOverride}}" @@ -55,7 +52,7 @@ menuentry "Network boot node with dracut: {{.Id}}" --id dracut { echo "KernelArgs: {{.KernelArgs}}" net_args="rd.neednet=1 {{range $devname, $netdev := .NetDevs}}{{if and $netdev.Hwaddr $netdev.Device}} ifname={{$netdev.Device}}:{{$netdev.Hwaddr}} {{end}}{{end}}" - wwinit_args="root=wwinit wwinit.container=${container} wwinit.system=${system} wwinit.runtime=${runtime} init=/init" + wwinit_args="root=wwinit wwinit.uri=${wwinit_uri}" linux $kernel wwid=${net_default_mac} {{.KernelArgs}} $net_args $wwinit_args if [ x$? = x0 ] ; then