D42146.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D42146.diff
View Options

	diff --git a/stand/i386/Makefile b/stand/i386/Makefile
	--- a/stand/i386/Makefile
	+++ b/stand/i386/Makefile
	@@ -17,7 +17,7 @@
	SUBDIR.yes+= loader_simp

	# special boot programs, 'self-extracting boot2+loader'
	-SUBDIR.yes+= pxeldr
	+SUBDIR.yes+= loader_pxe .WAIT pxeldr

	SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot

	diff --git a/stand/i386/loader_pxe/Makefile b/stand/i386/loader_pxe/Makefile
	new file mode 100644
	--- /dev/null
	+++ b/stand/i386/loader_pxe/Makefile
	@@ -0,0 +1,12 @@
	+
	+LOADER=loader_pxe
	+LOADERBIN= ${BOOTOBJ}/i386/${LOADER}/${LOADER}.bin
	+
	+LOADER_MSDOS_SUPPORT= no
	+LOADER_EXT2FS_SUPPORT= no
	+LOADER_GZIP_SUPPORT= no
	+LOADER_BZIP2_SUPPORT= no
	+
	+INSTALL_LOADER_FILE= 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
	@@ -11,7 +11,7 @@
	BOOT= pxeboot
	LDR= pxeldr
	ORG= 0x7c00
	-LOADER= loader
	+LOADER= loader_pxe

	.if defined(BOOT_PXELDR_PROBE_KEYBOARD)
	CFLAGS+=-DPROBE_KEYBOARD
	@@ -23,8 +23,7 @@

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

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

	CLEANFILES+= ${BOOT}.tmp