Attachment 244666 Details for Bug 257018 – 0001-stand-i386-fix-booting-over-TFTP-or-NFS.patch

[patch] 0001-stand-i386-fix-booting-over-TFTP-or-NFS.patch

0001-stand-i386-fix-booting-over-TFTP-or-NFS.patch (text/plain), 4.12 KB, created by Pierre Pronchery on 2023-09-05 19:45:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Pronchery

Created: 2023-09-05 19:45:24 UTC

Size: 4.12 KB

patch

obsolete

>From bbb9c03d432ba3b95dedbfa1da5e46558ad15cfa Mon Sep 17 00:00:00 2001
>From: Pierre Pronchery <pierre@freebsdfoundation.org>
>Date: Tue, 5 Sep 2023 20:47:21 +0200
>Subject: [PATCH] stand/i386: fix booting over TFTP or NFS
>
>The current PXE loader does not work since it became too big. By
>removing ZFS support, it is no longer possible to replace the local
>boot loader with the PXE loader, but it becomes possible again to
>continue booting the kernel over TFTP or NFS as expected.
>
>This is achieved by providing an additional subfolder and corresponding
>binary target for every loader supported, but where ZFS support is
>always disabled.
>
>The kernel loaded over the network can then provide ZFS support and boot
>the local system if desired.
>
>Test plan:
>
>In /usr/local/etc/dhcpd.conf: (isc-dhcp44-server package)
>
>  next-server 192.168.2.1;
>  filename "FreeBSD/boot/pxeboot";
>  option root-path "nfs://192.168.2.1/tftpboot/FreeBSD/amd64";
>
>In /etc/inetd.conf:
>
>  tftp	dgram	udp	wait	root	/usr/libexec/tftpd	tftpd -l -s /tftpboot
>
>In /tftpboot/FreeBSD/boot:
>
>  -rw-r--r--  1 root    wheel   415744 Sep  5 21:11 pxeboot
>
>PR: 257018
>Sponsored by: The FreeBSD Foundation
>---
> stand/defs.mk                       | 1 +
> stand/i386/Makefile                 | 8 ++++----
> stand/i386/loader_4th_pxe/Makefile  | 7 +++++++
> stand/i386/loader_lua_pxe/Makefile  | 9 +++++++++
> stand/i386/loader_simp_pxe/Makefile | 8 ++++++++
> stand/i386/pxeldr/Makefile          | 2 +-
> 6 files changed, 30 insertions(+), 5 deletions(-)
> create mode 100644 stand/i386/loader_4th_pxe/Makefile
> create mode 100644 stand/i386/loader_lua_pxe/Makefile
> create mode 100644 stand/i386/loader_simp_pxe/Makefile
>
>diff --git a/stand/defs.mk b/stand/defs.mk
>index e8480a8c2b1e..c7ffc4152bc1 100644
>--- a/stand/defs.mk
>+++ b/stand/defs.mk
>@@ -196,6 +196,7 @@ LOADER_DEFAULT_INTERP?=4th
> LOADER_DEFAULT_INTERP?=simp
> .endif
> LOADER_INTERP?=${LOADER_DEFAULT_INTERP}
>+LOADER_PXE_INTERP?=${LOADER_DEFAULT_INTERP}_pxe
> 
> # Make sure we use the machine link we're about to create
> CFLAGS+=-I.
>diff --git a/stand/i386/Makefile b/stand/i386/Makefile
>index e323a2cef9cd..1630b01cad22 100644
>--- a/stand/i386/Makefile
>+++ b/stand/i386/Makefile
>@@ -12,15 +12,15 @@ SUBDIR.yes+=	.WAIT
> SUBDIR.yes+=	mbr pmbr boot0 boot0sio boot2 cdboot gptboot \
> 		isoboot
> 
>-SUBDIR.${MK_FORTH}+= loader_4th
>-SUBDIR.${MK_LOADER_LUA}+= loader_lua
>-SUBDIR.yes+=	loader_simp
>+SUBDIR.${MK_FORTH}+= loader_4th loader_4th_pxe
>+SUBDIR.${MK_LOADER_LUA}+= loader_lua loader_lua_pxe
>+SUBDIR.yes+=	loader_simp loader_simp_pxe
> 
> # special boot programs, 'self-extracting boot2+loader'
> SUBDIR.yes+=	pxeldr
> 
> SUBDIR.${MK_LOADER_ZFS}+=	zfsboot gptzfsboot
> 
>-SUBDIR_DEPEND_pxeldr+=	loader_${LOADER_DEFAULT_INTERP}
>+SUBDIR_DEPEND_pxeldr+=	loader_${LOADER_PXE_INTERP}
> 
> .include <bsd.subdir.mk>
>diff --git a/stand/i386/loader_4th_pxe/Makefile b/stand/i386/loader_4th_pxe/Makefile
>new file mode 100644
>index 000000000000..669d0dd4724c
>--- /dev/null
>+++ b/stand/i386/loader_4th_pxe/Makefile
>@@ -0,0 +1,7 @@
>+
>+LOADER_INTERP=4th
>+LOADER=loader_${LOADER_PXE_INTERP}
>+INSTALL_LOADER_HELP_FILE=no
>+
>+.include "../loader/Makefile"
>+
>diff --git a/stand/i386/loader_lua_pxe/Makefile b/stand/i386/loader_lua_pxe/Makefile
>new file mode 100644
>index 000000000000..dc59543cfa9e
>--- /dev/null
>+++ b/stand/i386/loader_lua_pxe/Makefile
>@@ -0,0 +1,9 @@
>+
>+LOADER_INTERP=lua
>+LOADER=loader_${LOADER_PXE_INTERP}
>+INSTALL_LOADER_HELP_FILE=no
>+
>+MK_LOADER_ZFS=no
>+
>+.include "../loader/Makefile"
>+
>diff --git a/stand/i386/loader_simp_pxe/Makefile b/stand/i386/loader_simp_pxe/Makefile
>new file mode 100644
>index 000000000000..283480f86d82
>--- /dev/null
>+++ b/stand/i386/loader_simp_pxe/Makefile
>@@ -0,0 +1,8 @@
>+
>+LOADER_INTERP=simp
>+LOADER=loader_${LOADER_PXE_INTERP}
>+
>+MK_LOADER_ZFS=no
>+
>+.include "../loader/Makefile"
>+
>diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile
>index b2ecedd45940..9dbce9f59b71 100644
>--- a/stand/i386/pxeldr/Makefile
>+++ b/stand/i386/pxeldr/Makefile
>@@ -23,7 +23,7 @@ CFLAGS+=-DALWAYS_SERIAL
> 
> CFLAGS+=-I${BOOTSRC}/i386/common
> 
>-L=${LOADER_DEFAULT_INTERP}
>+L=${LOADER_PXE_INTERP}
> LOADERBIN= ${BOOTOBJ}/i386/loader_${L}/loader_${L}.bin
> 
> CLEANFILES+= ${BOOT}.tmp
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 257018: 244666