summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-03-03 22:53:35 +0000
committerru <ru@FreeBSD.org>2003-03-03 22:53:35 +0000
commitf9c71e51d94827e9ce6d18c09e0127db4f9e2f5a (patch)
tree585b9a902ad379a9f36e207a2b9697b59c17563d /sys/boot
parentb9d961af594cb9fc01abead1ba9fd397026a9363 (diff)
downloadFreeBSD-src-f9c71e51d94827e9ce6d18c09e0127db4f9e2f5a.zip
FreeBSD-src-f9c71e51d94827e9ce6d18c09e0127db4f9e2f5a.tar.gz
FreeBSD 5.0 has stopped shipping /modules 2.5 years ago. Catch
up with this further by excluding /modules from the (default) kern.module_path.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/common/help.common2
-rw-r--r--sys/boot/common/loader.82
-rw-r--r--sys/boot/common/module.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/common/help.common b/sys/boot/common/help.common
index 9ef8aff..fee152f 100644
--- a/sys/boot/common/help.common
+++ b/sys/boot/common/help.common
@@ -200,7 +200,7 @@
Sets the list of directories which will be searched in for modules
named in a load command or implicitly required by a dependancy. The
- default module_path is "/boot/kernel;/boot/modules;/modules".
+ default module_path is "/boot/kernel;/boot/modules".
################################################################################
# Tset Sprompt DSet the command prompt
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index c868922..7c0e2b8 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -374,7 +374,7 @@ Define the number of lines on the screen, to be used by the pager.
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 value for this variable is
-.Dq Li /;/boot;/modules .
+.Dq Li /boot/kernel;/boot/modules .
.It Va num_ide_disks
Sets the number of IDE disks as a work around for some problems in
finding the root disk at boot.
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c
index dbbf629..3237049 100644
--- a/sys/boot/common/module.c
+++ b/sys/boot/common/module.c
@@ -65,7 +65,7 @@ static void moduledir_rebuild(void);
/* load address should be tweaked by first module loaded (kernel) */
static vm_offset_t loadaddr = 0;
-static const char *default_searchpath ="/boot/kernel;/boot/modules;/modules";
+static const char *default_searchpath ="/boot/kernel;/boot/modules";
static STAILQ_HEAD(, moduledir) moduledir_list = STAILQ_HEAD_INITIALIZER(moduledir_list);
OpenPOWER on IntegriCloud