Date: Wed, 24 Jul 2013 01:08:45 +0000 (UTC) From: Craig Rodrigues <rodrigc@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r253586 - stable/9/sbin/mount Message-ID: <201307240108.r6O18jMr037901@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rodrigc Date: Wed Jul 24 01:08:45 2013 New Revision: 253586 URL: http://svnweb.freebsd.org/changeset/base/253586 Log: MFC 253433: In this GRN, Marcel Moolenaar overhauled the logic for mounting the root file system on bootup: |------------------------------------------------------------------------ |r214006 | marcel | 2010-10-17 22:01:53 -0700 (Sun, 17 Oct 2010) | 20 lines | | Re-implement the root mount logic using a recursive approach, whereby each |root file system (starting with devfs and a synthesized configuration) can |contain directives for mounting another file system as root. |------------------------------------------------------------------------ This commit adds a mount.conf(8) man page which documents the root mount logic. mount.conf(8) also provides some examples for the /.mount.conf file, which can be used to change the root mount behavior. Reviewed by: marcel bjk MFC: 253445: Minor mdoc fixes Approved by: re (gjb) Added: stable/9/sbin/mount/mount.conf.8 - copied, changed from r253433, head/sbin/mount/mount.conf.8 Modified: stable/9/sbin/mount/Makefile (contents, props changed) Directory Properties: stable/9/sbin/mount/ (props changed) Modified: stable/9/sbin/mount/Makefile ============================================================================== --- stable/9/sbin/mount/Makefile Tue Jul 23 23:43:00 2013 (r253585) +++ stable/9/sbin/mount/Makefile Wed Jul 24 01:08:45 2013 (r253586) @@ -3,7 +3,7 @@ PROG= mount SRCS= mount.c mount_fs.c getmntopts.c vfslist.c -MAN= mount.8 +MAN= mount.8 mount.conf.8 # We do NOT install the getmntopts.3 man page. DPADD= ${LIBUTIL} Copied and modified: stable/9/sbin/mount/mount.conf.8 (from r253433, head/sbin/mount/mount.conf.8) ============================================================================== --- head/sbin/mount/mount.conf.8 Wed Jul 17 19:32:07 2013 (r253433, copy source) +++ stable/9/sbin/mount/mount.conf.8 Wed Jul 24 01:08:45 2013 (r253586) @@ -43,7 +43,7 @@ using the logic in the function in .Pa src/sys/kern/vfs_mountroot.c . The root mount logic can be described as follows: -.Bl -enum +.Bl -enum .It The kernel will synthesize in memory a config file with default directives for mounting @@ -58,7 +58,7 @@ as the root file system. Next, the kernel will parse the in-memory config file created in step 1 and try to mount the actual root file system. See -.Sx FILE FORMAT +.Sx FILE FORMAT for the format of the config file. .It When the actual root file system is mounted, @@ -67,7 +67,7 @@ will be re-mounted on the .Pa /dev directory. .It -If a +If a .Pa /.mount.conf file does not exist in the root file system which was just mounted, the root mount logic stops here. @@ -110,7 +110,7 @@ mount -t {FS} -o {OPTIONS} {MOUNTPOINT} .Ed .Pp If this is successfully mounted, -further lines in +further lines in .Pa .mount.conf are ignored. If all lines in @@ -164,7 +164,7 @@ can manually enter the root file system Finally if that does not work, the kernel will panic. .Bd -literal -offset indent .Li .onfail panic -.LI .timeout 3 +.Li .timeout 3 cd9660:/dev/cd0 ro .Li .timeout 0 cd9660:/dev/acd0 ro @@ -211,7 +211,7 @@ The following example will direct the kernel to do a unionfs mount on a directory .Pa /jail/freebsd-8-stable -which has a +which has a .Xr chroot 2 environment. .Bd -literal -offset indent @@ -228,13 +228,13 @@ exist so that the root mount logic can p If this directory does not exist, the system may hang during the bootup process. .Sh SEE ALSO -.Xr boot 8 , +.Xr nmount 2 , +.Xr md 4 , .Xr boot.config 5 , .Xr fstab 5 , +.Xr boot 8 , .Xr loader 8 , -.Xr mount 8 , -.Xr md 4 , -.Xr nmount 2 +.Xr mount 8 .Sh HISTORY The .Nm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307240108.r6O18jMr037901>