From af300af357166433adf9c800a80232c37a451725 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 12 Dec 2014 10:51:26 +0100 Subject: [PATCH] Fix the default path where modules reside in various manual pages. Reported-by: Yellow Rabbit --- sbin/kldload/kldload.8 | 6 +++--- share/man/man4/kld.4 | 6 +++--- share/man/man4/netgraph.4 | 6 +++--- share/man/man4/splash.4 | 8 ++++---- share/man/man4/vinum.4 | 10 +++++----- share/man/man7/build.7 | 6 +++--- usr.sbin/asf/asf.8 | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8 index a6e2c18093..34f4f5a7c6 100644 --- a/sbin/kldload/kldload.8 +++ b/sbin/kldload/kldload.8 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD: src/sbin/kldload/kldload.8,v 1.7.2.10 2002/12/07 08:44:02 jmallett Exp $ .\" -.Dd March 12, 2014 +.Dd December 12, 2014 .Dt KLDLOAD 8 .Os .Sh NAME @@ -52,8 +52,8 @@ Do not try to load module if already loaded. Be more verbose. .El .Sh FILES -.Bl -tag -width /boot/modules -compact -.It Pa /boot/modules +.Bl -tag -width /boot/kernel -compact +.It Pa /boot/kernel directory containing loadable modules. Modules must have an extension of .Pa .ko . diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4 index 40b68f7c64..24ee67c2fc 100644 --- a/share/man/man4/kld.4 +++ b/share/man/man4/kld.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD: src/share/man/man4/kld.4,v 1.5.2.6 2001/08/17 13:08:38 ru Exp $ .\" -.Dd August 6, 2009 +.Dd December 12, 2014 .Dt KLD 4 .Os .Sh NAME @@ -61,7 +61,7 @@ client and server, all the screen-savers, and the emulator. .Nm modules are placed by default in the -.Pa /boot/modules +.Pa /boot/kernel directory. .Pp The @@ -88,7 +88,7 @@ program is used to check the status of the modules currently loaded into the system. .Sh FILES .Bl -tag -width ".In sys/module.h" -compact -.It Pa /boot/modules +.It Pa /boot/kernel directory containing module binaries shipped with the system .It In sys/module.h file containing definitions required to compile a diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4 index c1fc824a33..ad2e3009e8 100644 --- a/share/man/man4/netgraph.4 +++ b/share/man/man4/netgraph.4 @@ -36,7 +36,7 @@ .\" $FreeBSD: src/share/man/man4/netgraph.4,v 1.39.2.1 2001/12/21 09:00:50 ru Exp $ .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $ .\" -.Dd September 2, 2008 +.Dd December 12, 2014 .Dt NETGRAPH 4 .Os .Sh NAME @@ -1005,9 +1005,9 @@ Definitions needed to use .Nm {type} nodes, including the type cookie definition. -.It Pa /boot/modules/netgraph.ko +.It Pa /boot/kernel/netgraph.ko Netgraph subsystem loadable KLD module. -.It Pa /boot/modules/ng_{type}.ko +.It Pa /boot/kernel/ng_{type}.ko Loadable KLD module for node type {type}. .El .Sh USER MODE SUPPORT diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4 index 52a17419e6..04b1472d1f 100644 --- a/share/man/man4/splash.4 +++ b/share/man/man4/splash.4 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD: src/share/man/man4/splash.4,v 1.9.2.7 2001/08/17 13:08:39 ru Exp $ .\" -.Dd September 2, 2008 +.Dd December 12, 2014 .Dt SPLASH 4 .Os .Sh NAME @@ -171,11 +171,11 @@ section above. boot loader configuration defaults .It Pa /etc/rc.conf system configuration information -.It Pa /boot/modules/splash_*.ko +.It Pa /boot/kernel/splash_*.ko splash image decoder modules -.It Pa /boot/modules/*_saver.ko +.It Pa /boot/kernel/*_saver.ko screen saver modules -.It Pa /boot/modules/vesa.ko +.It Pa /boot/kernel/vesa.ko the VESA support module .El .Sh EXAMPLES diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4 index 9d2d82a355..9821c9fd71 100644 --- a/share/man/man4/vinum.4 +++ b/share/man/man4/vinum.4 @@ -36,7 +36,7 @@ .\" .\" $FreeBSD: src/share/man/man4/vinum.4,v 1.22.2.9 2002/04/22 08:19:35 kuriyama Exp $ .\" -.Dd September 2, 2008 +.Dd December 12, 2014 .Dt VINUM 4 .Os .Sh NAME @@ -877,19 +877,19 @@ builds a module with debugging symbols by default. If the version of .Nm in -.Pa /boot/modules +.Pa /boot/kernel does not contain symbols, you will not get an error message, but the stack trace will not show the symbols. Check the module before starting .Xr kgdb 1 : .Bd -literal -$ file /boot/modules/vinum.ko -/boot/modules/vinum.ko: ELF 32-bit LSB shared object, Intel 80386, +$ file /boot/kernel/vinum.ko +/boot/kernel/vinum.ko: ELF 32-bit LSB shared object, Intel 80386, version 1 (SYSV), dynamically linked, not stripped .Ed .Pp If the output shows that -.Pa /boot/modules/vinum.ko +.Pa /boot/kernel/vinum.ko is stripped, you will have to find a version which is not. Usually this will be either in diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 96faa50637..c28f6408bf 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD: src/share/man/man7/build.7,v 1.19.2.1 2002/03/18 08:33:02 murray Exp $ .\" -.Dd October 26, 2014 +.Dd December 12, 2014 .Dt BUILD 7 .Os .Sh NAME @@ -208,9 +208,9 @@ make DESTLABEL=test installkernel .Ed .Pp installs them as -.Pa /boot/kernel.test +.Pa /boot/kernel.test/kernel and -.Pa /boot/modules.test , +.Pa /boot/kernel.test , respectively. .It Ev DESTKERNDIR Where to install the kernel and the modules (the default is diff --git a/usr.sbin/asf/asf.8 b/usr.sbin/asf/asf.8 index 45bec86154..107b9b63ff 100644 --- a/usr.sbin/asf/asf.8 +++ b/usr.sbin/asf/asf.8 @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.Dd February 21, 2009 +.Dd December 12, 2014 .Dt ASF 8 .Os .Sh NAME @@ -52,7 +52,7 @@ If is specified, .Nm uses it for the modules directory instead of the default -.Pa /boot/modules . +.Pa /boot/kernel . This is useful when building in a non-standard location (i.e., not .Pa /usr/src and -- 2.41.0