D41750.id127333.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D41750.id127333.diff
View Options

	diff --git a/stand/i386/Makefile b/stand/i386/Makefile
	--- a/stand/i386/Makefile
	+++ b/stand/i386/Makefile
	@@ -13,7 +13,7 @@
	isoboot

	SUBDIR.${MK_FORTH}+= loader_4th
	-SUBDIR.${MK_LOADER_LUA}+= loader_lua
	+SUBDIR.${MK_LOADER_LUA}+= loader_lua loader_lua_nozfs
	SUBDIR.yes+= loader_simp

	# special boot programs, 'self-extracting boot2+loader'
	@@ -21,6 +21,6 @@

	SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot

	-SUBDIR_DEPEND_pxeldr+= loader_${LOADER_DEFAULT_INTERP}
	+SUBDIR_DEPEND_pxeldr+= loader_lua_nozfs

	.include <bsd.subdir.mk>
	diff --git a/stand/i386/loader_lua_nozfs/Makefile b/stand/i386/loader_lua_nozfs/Makefile
	new file mode 100644
	--- /dev/null
	+++ b/stand/i386/loader_lua_nozfs/Makefile
	@@ -0,0 +1,9 @@
	+
	+LOADER_INTERP=lua
	+LOADER=loader_lua_nozfs
	+INSTALL_LOADER_HELP_FILE=no
	+
	+MK_LOADER_ZFS=no
	+
	+.include "../loader/Makefile"
	+
	diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile
	--- a/stand/i386/pxeldr/Makefile
	+++ b/stand/i386/pxeldr/Makefile
	@@ -23,8 +23,8 @@

	CFLAGS+=-I${BOOTSRC}/i386/common

	-L=${LOADER_DEFAULT_INTERP}
	-LOADERBIN= ${BOOTOBJ}/i386/loader_${L}/loader_${L}.bin
	+L=loader_lua_nozfs
	+LOADERBIN= ${BOOTOBJ}/i386/${L}/${L}.bin

	CLEANFILES+= ${BOOT}.tmp