git: c19ac840d345 - stable/14 - pxeboot: Allow a different default loader for pxeboot
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 13 Aug 2024 17:31:36 UTC
The branch stable/14 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=c19ac840d345245887b0e797fd10e7a13b0fd2c9
commit c19ac840d345245887b0e797fd10e7a13b0fd2c9
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-08-05 21:19:29 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-08-13 17:31:38 +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
(cherry picked from commit f4762e9135d181f5d4f2a9d688ff803ee53ad808)
---
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 e323a2cef9cd..883cd4a556bb 100644
--- a/stand/i386/Makefile
+++ b/stand/i386/Makefile
@@ -21,6 +21,11 @@ SUBDIR.yes+= 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 b2ecedd45940..27f9a44cf21c 100644
--- a/stand/i386/pxeldr/Makefile
+++ b/stand/i386/pxeldr/Makefile
@@ -23,7 +23,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