Use the wwinit uri built by iPXE during dracut

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-07-05 12:12:49 -06:00
parent becd0a5e32
commit 624631a4d5
4 changed files with 4 additions and 5 deletions

View File

@@ -14,7 +14,7 @@ depends() {
}
install() {
inst_multiple cpio curl dmidecode
inst_multiple cpio curl
inst_hook cmdline 30 "$moddir/parse-wwinit.sh"
inst_hook pre-mount 30 "$moddir/load-wwinit.sh"
}

View File

@@ -6,7 +6,7 @@
if [ "${root}" = "wwinit" ]
then
info "root=${root}"
export wwinit_uri="http://$(getarg wwinit.uri)/provision/$(getarg wwid)?assetkey=$(dmidecode -s chassis-asset-tag)&uuid=$(dmidecode -s system-uuid)&stage="
wwinit_uri="$(getarg wwinit.uri)"
export wwinit_container="${wwinit_uri}container&compress=gz"; info "wwinit.container=${wwinit_container}"
export wwinit_system="${wwinit_uri}system&compress=gz"; info "wwinit.system=${wwinit_system}"
export wwinit_runtime="${wwinit_uri}runtime&compress=gz"; info "wwinit.runtime=${wwinit_runtime}"

View File

@@ -29,7 +29,7 @@ echo Downloading initramfs
initrd --name initramfs ${uri}&stage=initramfs || goto reboot
set dracut_net rd.neednet=1 {{range $devname, $netdev := .NetDevs}}{{if and $netdev.Hwaddr $netdev.Device}} ifname={{$netdev.Device}}:{{$netdev.Hwaddr}} {{end}}{{end}}
set dracut_wwinit root=wwinit wwinit_uri={{.Ipaddr}}:{{.Port}} {{if ne .KernelOverride ""}}wwinit.KernelOverride={{ .KernelOverride }}{{end}} init=/init
set dracut_wwinit root=wwinit wwinit.uri=${uri} {{if ne .KernelOverride ""}}wwinit.KernelOverride={{ .KernelOverride }}{{end}} init=/init
echo Booting initramfs
#echo Network KernelArgs: ${dracut_net}

View File

@@ -95,7 +95,6 @@ Requires: dracut-network
%endif
Requires: curl
Requires: cpio
Requires: dmidecode
%description dracut
Warewulf is a stateless and diskless container operating system provisioning
@@ -221,7 +220,7 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup}
%changelog
* Tue Jun 18 2024 Josh Burks <jeburks2@asu.edu>
- Add curl, cpio, dmidecode as requires for warewulf-dracut
- Add curl, cpio as requires for warewulf-dracut
* Thu Apr 18 2024 Jonathon Anderson <janderson@ciq.com>
- New warewulf-dracut subpackage