Date: Tue, 6 Aug 2024 23:30:30 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f4762e9135d1 - main - pxeboot: Allow a different default loader for pxeboot Message-ID: <202408062330.476NUUmQ080882@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f4762e9135d181f5d4f2a9d688ff803ee53ad808 commit f4762e9135d181f5d4f2a9d688ff803ee53ad808 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-08-05 21:19:29 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-08-06 23:22:36 +0000 pxeboot: Allow a different default loader for pxeboot Sometimes you need / want a different boot loader than loader_lua for pkeldr. Provide an option to get either the 4th one or the simp one. MFC After: 3 days Sponsored by: Netflix Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46213 --- stand/i386/Makefile | 7 ++++++- stand/i386/pxeldr/Makefile | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stand/i386/Makefile b/stand/i386/Makefile index f9aedcc3a008..768496598575 100644 --- a/stand/i386/Makefile +++ b/stand/i386/Makefile @@ -20,6 +20,11 @@ SUBDIR.${MK_LOADER_PXEBOOT}+= pxeldr SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot -SUBDIR_DEPEND_pxeldr+= loader_${LOADER_DEFAULT_INTERP} +.if defined(PXEBOOT_DEFAULT_INTERP) +L=${PXEBOOT_DEFAULT_INTERP} +.else +L=${LOADER_DEFAULT_INTERP} +.endif +SUBDIR_DEPEND_pxeldr+= loader_${L} .include <bsd.subdir.mk> diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile index a303aff413a8..bec2a27af47a 100644 --- a/stand/i386/pxeldr/Makefile +++ b/stand/i386/pxeldr/Makefile @@ -22,7 +22,11 @@ CFLAGS+=-DALWAYS_SERIAL CFLAGS+=-I${BOOTSRC}/i386/common +.if defined(PXEBOOT_DEFAULT_INTERP) +L=${PXEBOOT_DEFAULT_INTERP} +.else L=${LOADER_DEFAULT_INTERP} +.endif LOADERBIN= ${BOOTOBJ}/i386/loader_${L}/loader_${L}.bin CLEANFILES+= ${BOOT}.tmp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408062330.476NUUmQ080882>