Relase Engineering - Update loader-bootp.conf for new "boot/" prefixed paths

Update the default loader-bootp.conf and related manual pages to use
modern "boot/" prefixed paths.

diff --git a/sys/boot/forth/loader-bootp.conf b/sys/boot/forth/loader-bootp.conf
index eb6e82d..18637f8 100644 (file)
--- a/sys/boot/forth/loader-bootp.conf
+++ b/sys/boot/forth/loader-bootp.conf
@@ -51,7 +51,7 @@ bitmap_type="splash_image_data" # and place it on the module_path
 #loader_color="NO"             # Set to YES for a color version of Fred
 #console="vidconsole"          # Set the current console
 #currdev="disk1s1a"            # Set the current device
-module_path="/;/modules"       # Set the module search path
+module_path="/boot;/boot/modules;/;/modules"   # Set the module search path
 #prompt="\\${interpret}"       # Set the command prompt
 #root_disk_unit="0"            # Force the root disk unit number
 #rootdev="disk1s1a"            # Set the root filesystem
@@ -332,7 +332,8 @@ atspeaker_load="NO"         # AT speaker module
 
 acpi_dsdt_load="NO"            # DSDT Overriding
 acpi_dsdt_type="acpi_dsdt"     # Don't change this
-acpi_dsdt_name="acpi_dsdt.aml" # Override DSDT in BIOS by this file
+acpi_dsdt_name="/boot/acpi_dsdt.aml"
+                               # Override DSDT in BIOS by this file
 
 
 ##############################################################

diff --git a/sys/boot/pc32/pxeldr/pxeboot.8 b/sys/boot/pc32/pxeldr/pxeboot.8
index 4de62b9..dae74f2 100644 (file)
--- a/sys/boot/pc32/pxeldr/pxeboot.8
+++ b/sys/boot/pc32/pxeldr/pxeboot.8
@@ -69,8 +69,9 @@ default-lease-time 120;
 max-lease-time 120;
 
 subnet 10.0.0.0 netmask 255.255.255.0 {
-       filename "pxeboot";
+       filename "boot/pxeboot";
        range 10.0.0.10 10.0.0.254;
+       option root-path "10.0.0.1:/netbootroot";
 }
 
 .Ed
@@ -87,6 +88,29 @@ expects to fetch
 .Pa /boot/loader.rc
 from the specified server before loading any other files.
 .Pp
+.Nm
+uses
+.Pa /boot/kernel.BOOTP ,
+.Pa /boot/loader-bootp.conf ,
+and
+.Pa nextboot-bootp.conf
+instead of
+.Pa /boot/kernel ,
+.Pa /boot/loader.conf ,
+and
+.Pa nexboot.conf .
+Note that the TFTP version
+.Xr pxeboot_tftp 8
+uses the standard boot loader files.
+The NFS version uses different files to allow BOOTP boots via NFS to
+be overloaded onto the same directory structure as a normal boot,
+though many other changes would have to be made to actually make
+that work.
+However, this is more for historical reasons.
+Current day PXE boot code can handle complex root-path specifications
+allowing the root image to be contained in a sub-directory of the NFS
+export.
+.Pp
 In all other respects,
 .Nm
 acts just like

diff --git a/sys/boot/pc32/pxeldr_tftp/pxeboot_tftp.8 b/sys/boot/pc32/pxeldr_tftp/pxeboot_tftp.8
index e51ecdc..b896504 100644 (file)
--- a/sys/boot/pc32/pxeldr_tftp/pxeboot_tftp.8
+++ b/sys/boot/pc32/pxeldr_tftp/pxeboot_tftp.8
@@ -68,8 +68,9 @@ default-lease-time 120;
 max-lease-time 120;
 
 subnet 10.0.0.0 netmask 255.255.255.0 {
-       filename "pxeboot_tftp";
+       filename "boot/pxeboot_tftp";
        range 10.0.0.10 10.0.0.254;
+       option root-path "10.0.0.1:/netbootroot";
 }
 
 .Ed