diff options
-rw-r--r-- | etc/defaults/make.conf | 6 | ||||
-rw-r--r-- | share/examples/etc/make.conf | 6 | ||||
-rw-r--r-- | sys/boot/i386/loader/Makefile | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 78dfd94..d94e1fa 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -152,6 +152,12 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ # #BOOT_COMCONSOLE_SPEED= 115200 # +# By default the 'pxeboot' loader retrieves the kernel via NFS. Defining +# this and recompiling /usr/src/sys/boot will cause it to retrieve the kernel +# via TFTP. This allows pxeboot to load a custom BOOTP diskless kernel yet +# still mount the server's '/' (i.e. rather then load the server's kernel). +# +#LOADER_TFTP_SUPPORT= YES # # By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier. # If you have a XFree86 from before 3.0 that has the X distribution in diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 78dfd94..d94e1fa 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -152,6 +152,12 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ # #BOOT_COMCONSOLE_SPEED= 115200 # +# By default the 'pxeboot' loader retrieves the kernel via NFS. Defining +# this and recompiling /usr/src/sys/boot will cause it to retrieve the kernel +# via TFTP. This allows pxeboot to load a custom BOOTP diskless kernel yet +# still mount the server's '/' (i.e. rather then load the server's kernel). +# +#LOADER_TFTP_SUPPORT= YES # # By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier. # If you have a XFree86 from before 3.0 that has the X distribution in diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index b70281b..fa54f51 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -11,8 +11,11 @@ BINDIR?= /boot SRCS= main.c conf.c # Enable PXE TFTP or NFS support, not both. +.if defined(LOADER_TFTP_SUPPORT) +CFLAGS+= -DLOADER_TFTP_SUPPORT +.else CFLAGS+= -DLOADER_NFS_SUPPORT -#CFLAGS+= -DLOADER_TFTP_SUPPORT +.endif # Enable PnP and ISA-PnP code. HAVE_PNP= yes |