From e5cded4980ee86bb689763697e37a2f4468f9cff Mon Sep 17 00:00:00 2001 From: Itxaka Date: Tue, 30 Jan 2024 14:39:07 +0100 Subject: [PATCH] Rename modepair.enable to install-mode Signed-off-by: Itxaka --- tests/fixtures/simple.yaml | 2 +- tools-image/ipxe.tmpl | 2 +- tools-image/netboot.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fixtures/simple.yaml b/tests/fixtures/simple.yaml index bd5e5b7..bfe8701 100644 --- a/tests/fixtures/simple.yaml +++ b/tests/fixtures/simple.yaml @@ -31,7 +31,7 @@ spec: fi menuentry "install" --class os --unrestricted { echo Loading kernel... - $linux ($root)/boot/kernel.xz cdroot root=live:CDLABEL=COS_LIVE rd.live.dir=/ rd.live.squashimg=rootfs.squashfs console=tty1 console=ttyS0 rd.cos.disable vga=795 nomodeset nodepair.enable + $linux ($root)/boot/kernel.xz cdroot root=live:CDLABEL=COS_LIVE rd.live.dir=/ rd.live.squashimg=rootfs.squashfs console=tty1 console=ttyS0 rd.cos.disable vga=795 nomodeset install-mode echo Loading initrd... $initrd ($root)/boot/rootfs.xz } diff --git a/tools-image/ipxe.tmpl b/tools-image/ipxe.tmpl index 82ba7b5..9549fa3 100644 --- a/tools-image/ipxe.tmpl +++ b/tools-image/ipxe.tmpl @@ -2,6 +2,6 @@ set dns 8.8.8.8 ifconf -kernel ${RELEASE_URL}/${VERSION}/${ISO_NAME}-kernel root=live:${RELEASE_URL}/${VERSION}/${ISO_NAME}.squashfs initrd=${ISO_NAME}-initrd rd.neednet=1 ip=dhcp rd.cos.disable netboot nodepair.enable config_url=${config} console=tty1 console=ttyS0 rd.live.overlay.overlayfs ${cmdline} +kernel ${RELEASE_URL}/${VERSION}/${ISO_NAME}-kernel root=live:${RELEASE_URL}/${VERSION}/${ISO_NAME}.squashfs initrd=${ISO_NAME}-initrd rd.neednet=1 ip=dhcp rd.cos.disable netboot install-mode config_url=${config} console=tty1 console=ttyS0 rd.live.overlay.overlayfs ${cmdline} initrd ${RELEASE_URL}/${VERSION}/${ISO_NAME}-initrd boot \ No newline at end of file diff --git a/tools-image/netboot.sh b/tools-image/netboot.sh index a31767e..34da4cc 100755 --- a/tools-image/netboot.sh +++ b/tools-image/netboot.sh @@ -19,7 +19,7 @@ set initrd $ARTIFACT_NAME-initrd set rootfs $ARTIFACT_NAME.squashfs # set config https://example.com/machine-config # set cmdline extra.values=1 -kernel \${url}/\${kernel} initrd=\${initrd} ip=dhcp rd.cos.disable root=live:\${url}/\${rootfs} netboot nodepair.enable config_url=\${config} console=tty1 console=ttyS0 \${cmdline} +kernel \${url}/\${kernel} initrd=\${initrd} ip=dhcp rd.cos.disable root=live:\${url}/\${rootfs} netboot install-mode config_url=\${config} console=tty1 console=ttyS0 \${cmdline} initrd \${url}/\${initrd} boot EOF \ No newline at end of file