From bd8fc733cbccf86b5bf3dc0aaa6e62b094f4164c Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Fri, 6 Aug 2004 15:06:06 +0000 Subject: [PATCH] remove /boot/kernel from the default path.. There is already code that will prepend the current kernel booting... This prevents a problem of loading /boot/kernel's modules when a different kernel has no modules, but you left your module_load="YES" in loader.conf... Reviewed by: dcs (minus the help part) --- sys/boot/common/help.common | 3 ++- sys/boot/forth/loader.conf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/boot/common/help.common b/sys/boot/common/help.common index 94b4b5c27fb9..40953bd73709 100644 --- a/sys/boot/common/help.common +++ b/sys/boot/common/help.common @@ -205,7 +205,8 @@ Sets the list of directories which will be searched in for modules named in a load command or implicitly required by a dependency. The - default module_path is "/boot/kernel;/boot/modules". + default module_path is "/boot/modules" with the kernel directory + prepended. ################################################################################ # Tset Sprompt DSet the command prompt diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index d6065144b9e1..d5516d98e7d8 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -49,7 +49,7 @@ bitmap_type="splash_image_data" # and place it on the module_path #beastie_disable="NO" # Turn the beastie boot menu on and off #console="vidconsole" # Set the current console #currdev="disk1s1a" # Set the current device -module_path="/boot/kernel;/boot/modules" # Set the module search path +module_path="/boot/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