diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 8d4a1a1a3009..7d0f1fc25640 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -373,7 +373,6 @@ file system table .Xr mount_ext2fs 8 , .Xr mount_fdesc 8 , .Xr mount_hpfs 8 , -.Xr mount_kernfs 8 , .Xr mount_linprocfs 8 , .Xr mount_mfs 8 , .Xr mount_msdos 8 , diff --git a/sbin/mount_ifs/mount.8 b/sbin/mount_ifs/mount.8 index 64a689c3b25b..4b4bb59e20b5 100644 --- a/sbin/mount_ifs/mount.8 +++ b/sbin/mount_ifs/mount.8 @@ -360,7 +360,6 @@ file system table .Xr mount_cd9660 8 , .Xr mount_devfs 8 , .Xr mount_fdesc 8 , -.Xr mount_kernfs 8 , .Xr mount_mfs 8 , .Xr mount_msdos 8 , .Xr mount_nfs 8 , diff --git a/sbin/mount_std/Makefile b/sbin/mount_std/Makefile index 320bbf788096..de3c07bd48e9 100644 --- a/sbin/mount_std/Makefile +++ b/sbin/mount_std/Makefile @@ -4,8 +4,9 @@ PROG= mount_std SRCS= mount_std.c getmntopts.c MAN8= mount_std.8 -MLINKS= mount_std.8 mount_devfs.8 mount_std.8 mount_fdesc.8 \ - mount_std.8 mount_kernfs.8 mount_std.8 mount_linprocfs.8 \ +MLINKS= mount_std.8 mount_devfs.8 \ + mount_std.8 mount_fdesc.8 \ + mount_std.8 mount_linprocfs.8 \ mount_std.8 mount_procfs.8 MOUNT= ${.CURDIR}/../mount @@ -14,7 +15,6 @@ CFLAGS+= -I${MOUNT} LINKS= ${BINDIR}/mount_std ${BINDIR}/mount_devfs \ ${BINDIR}/mount_std ${BINDIR}/mount_fdesc \ - ${BINDIR}/mount_std ${BINDIR}/mount_kernfs \ ${BINDIR}/mount_std ${BINDIR}/mount_linprocfs \ ${BINDIR}/mount_std ${BINDIR}/mount_procfs diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8 index f4571cabd55b..46dcd278af7f 100644 --- a/sbin/mount_std/mount_std.8 +++ b/sbin/mount_std/mount_std.8 @@ -43,7 +43,6 @@ .Nm mount_std , .Nm mount_devfs , .Nm mount_fdesc , -.Nm mount_kernfs , .Nm mount_linprocfs , .Nm mount_procfs .Nd mount ``standard'' filesystems @@ -61,7 +60,6 @@ the filesystem. The command currently supports the following filesystems: .Nm devfs , .Nm fdesc , -.Nm kernfs , .Nm linprocfs and .Nm procfs . @@ -122,7 +120,6 @@ Refer to the following manual pages for detailed information on these file system: .Xr devfs 5 , .Xr fdesc 5 , -.Xr kernfs 5 , .Xr linprocfs 5 and .Xr procfs 5 . @@ -147,7 +144,6 @@ loadable module for it was found. .Xr devfs 5 , .Xr fdesc 5 , .Xr fstab 5 , -.Xr kernfs 5 , .Xr linprocfs 5 , .Xr procfs 5 , .Xr mount 8 @@ -161,8 +157,7 @@ utility first appeared in Loadable filesystem modules first appeared in .Fx 2.0 . The -.Dq fdesc , -.Dq kernfs , +.Dq fdesc and .Dq procfs filesystem types first appeared in diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index 40c03146cf93..b0b6e576d246 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -5,7 +5,7 @@ MAN5= a.out.5 acct.5 core.5 devfs.5 dir.5 disktab.5 ethers.5 \ elf.5 fbtab.5 fdesc.5 forward.5 fs.5 fstab.5 group.5 \ hesiod.conf.5 \ - hosts.5 hosts.equiv.5 hosts.lpd.5 intro.5 kernfs.5 link.5 \ + hosts.5 hosts.equiv.5 hosts.lpd.5 intro.5 link.5 \ linprocfs.5 make.conf.5 mailer.conf.5 motd.5 networks.5 \ nsswitch.conf.5 \ passwd.5 pbm.5 periodic.conf.5 \ diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5 index 2b490aa9d3b5..6c0119e61cf4 100644 --- a/share/man/man5/fstab.5 +++ b/share/man/man5/fstab.5 @@ -110,8 +110,6 @@ a CD-ROM filesystem (as per ISO 9660) .\" maybe also say Rock Ridge extensions are handled ? .It Em procfs a file system for accessing process data -.It Em kernfs -a file system for accessing kernel parameter .El .Pp The fourth field, diff --git a/share/man/man5/kernfs.5 b/share/man/man5/kernfs.5 deleted file mode 100644 index 2cb200e43eff..000000000000 --- a/share/man/man5/kernfs.5 +++ /dev/null @@ -1,130 +0,0 @@ -.\" Copyright (c) 1996 -.\" Mike Pritchard . All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by Mike Pritchard. -.\" 4. Neither the name of author nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $FreeBSD$ -.\" -.Dd December 14, 1996 -.Dt KERNFS 5 -.Os BSD 4.4 -.Sh NAME -.Nm kernfs -.Nd kernel file system -.Sh SYNOPSIS -.Bd -literal -kern /kern kernfs rw 0 0 -.Ed -.Sh DESCRIPTION -The kernel file system, or -.Nm , -provides access to information on the currently running kernel. -It is normally mounted on -.Pa /kern . -The file system includes several regular files which can be -read, and some of which can also be written. -The contents of the files are in a machine-independent format, -either a string or an integer in decimal ASCII. A trailing -newline character is added when a number is returned. -.Pp -The mount point contains the following files: -.Bl -tag -width copyright -.It Pa bootfile -The path from which the current kernel was booted. -.It Pa boottime -The time at which the system was last booted (decimal ASCII). -.It Pa copyright -The kernel copyright message. -.It Pa hostname -The current hostname, with a trailing newline. The -current hostname can be changed by writing to this file. -A trailing newline will be stripped from the hostname being -written. -.It Pa hz -The frequency of the system clock (decimal ASCII). -.It Pa loadavg -The 1, 5 and 15 minute load averages in kernel fixed-point -format. The final integer is the fix-point scaling factor. -All numbers are in decimal ASCII. -.It Pa pagesize -The machine pagesize (decimal ASCII). -.It Pa physmem -The number of pages of physical memory in the machine (decimal ASCII). -.It Pa root -The system root directory. In a chroot'ed environment, -.Xr mount_kernfs 8 -can be used to create a new -.Pa /kern -mount point. -.Pa /kern/root -will then refer to the system global root, not the current -process root. Not currently enabled. -.It Pa rootdev -The root device. Not currently enabled. -.It Pa rrootdev -The raw root device. Not currently enabled. -.It Pa time -The second and microsecond values of the system clock (decimal ASCII). -.It Pa version -The kernel version string. The head line for -.Pa /etc/motd -can be generated by running -.Dq Ic "sed 1q /kern/version" -.El -.Pp -Most of the information provided by the -.Nm -is also available from -.Xr sysctl 8 . -.Sh FILES -.Bl -tag -width /kern/XXXXXXX -.It Pa /kern -normal mount point for the -.Nm . -.El -.Sh SEE ALSO -.Xr sysctl 3 , -.Xr mount_kernfs 8 , -.Xr sysctl 8 -.Sh HISTORY -The -.Nm -first appeared in -.Bx 4.4 . -The -.Nm -manual page first appeared in -.Fx 2.2 . -.Sh AUTHORS -.An -nosplit -This manual page was written by -.An Mike Pritchard Aq mpp@FreeBSD.org , -and was adapted from the -.Xr mount_kernfs 8 -manual page written by -.An Jan-Simon Pendry . diff --git a/usr.sbin/crunch/examples/really-big.conf b/usr.sbin/crunch/examples/really-big.conf index 17c7c6418246..016d10d7ce77 100644 --- a/usr.sbin/crunch/examples/really-big.conf +++ b/usr.sbin/crunch/examples/really-big.conf @@ -4,6 +4,9 @@ # could probably get even more stuff (like libexec stuff) in here. # # This produces a 4608000 byte binary. Pretty sick and twisted, eh? +# +# $FreeBSD$ +# # ========================================================================= @@ -22,7 +25,7 @@ srcdirs /usr/src/sbin progs badsect bim clri disklabel dmesg dump dumpfs fdisk fsck halt progs ifconfig init mknod modload modunload mount mount_fdesc mount_isofs -progs mount_kernfs mount_lofs mount_msdos mount_portal mount_procfs mountd +progs mount_lofs mount_msdos mount_portal mount_procfs mountd progs newfs nfsd nfsiod ping quotacheck reboot restore route routed savecore progs shutdown slattach swapon ttyflags tunefs umount # shell scripts: fastboot