Module Name: src
Committed By: jruoho
Date: Tue Apr 13 07:32:31 UTC 2010
Modified Files:
src/distrib/sets/lists/comp: mi
src/share/man/man9: Makefile cpu_rootconf.9
Log Message:
As the cited setroot(9) was nonexistent, briefly document it here.
To generate a diff of this commit:
cvs rdiff -u -r1.1427 -r1.1428 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.324 -r1.325 src/share/man/man9/Makefile
cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/cpu_rootconf.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1427 src/distrib/sets/lists/comp/mi:1.1428
--- src/distrib/sets/lists/comp/mi:1.1427 Tue Apr 13 05:40:12 2010
+++ src/distrib/sets/lists/comp/mi Tue Apr 13 07:32:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1427 2010/04/13 05:40:12 jruoho Exp $
+# $NetBSD: mi,v 1.1428 2010/04/13 07:32:31 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -9475,6 +9475,7 @@
./usr/share/man/cat9/setdisklabel.0 comp-sys-catman .cat
./usr/share/man/cat9/setbit.0 comp-sys-catman .cat
./usr/share/man/cat9/setjmp.0 comp-sys-catman .cat
+./usr/share/man/cat9/setroot.0 comp-sys-catman .cat
./usr/share/man/cat9/setrunqueue.0 comp-obsolete obsolete
./usr/share/man/cat9/shutdownhook_disestablish.0 comp-sys-catman .cat
./usr/share/man/cat9/shutdownhook_establish.0 comp-sys-catman .cat
@@ -15120,6 +15121,7 @@
./usr/share/man/html9/setdisklabel.html comp-sys-htmlman html
./usr/share/man/html9/setbit.html comp-sys-htmlman html
./usr/share/man/html9/setjmp.html comp-sys-htmlman html
+./usr/share/man/html9/setroot.html comp-sys-htmlman html
./usr/share/man/html9/shutdownhook_disestablish.html comp-sys-htmlman html
./usr/share/man/html9/shutdownhook_establish.html comp-sys-htmlman html
./usr/share/man/html9/sigaction1.html comp-sys-htmlman html
@@ -20964,6 +20966,7 @@
./usr/share/man/man9/setdisklabel.9 comp-sys-man .man
./usr/share/man/man9/setbit.9 comp-sys-man .man
./usr/share/man/man9/setjmp.9 comp-sys-man .man
+./usr/share/man/man9/setroot.9 comp-sys-man .man
./usr/share/man/man9/setrunqueue.9 comp-obsolete obsolete
./usr/share/man/man9/shutdownhook_disestablish.9 comp-sys-man .man
./usr/share/man/man9/shutdownhook_establish.9 comp-sys-man .man
Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.324 src/share/man/man9/Makefile:1.325
--- src/share/man/man9/Makefile:1.324 Tue Apr 13 05:40:12 2010
+++ src/share/man/man9/Makefile Tue Apr 13 07:32:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.324 2010/04/13 05:40:12 jruoho Exp $
+# $NetBSD: Makefile,v 1.325 2010/04/13 07:32:31 jruoho Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -222,6 +222,7 @@
MLINKS+=cpu_dumpconf.9 cpu_dump.9 cpu_dumpconf.9 cpu_dumpsize.9 \
cpu_dumpconf.9 dumpsys.9
MLINKS+=cpu_lwp_fork.9 child_return.9 cpu_lwp_fork.9 proc_trampoline.9
+MLINKS+=cpu_rootconf.9 setroot.9
MLINKS+=cpu_swapout.9 cpu_swapin.9
MLINKS+=curproc.9 curcpu.9 curproc.9 curlwp.9
MLINKS+=delay.9 DELAY.9
Index: src/share/man/man9/cpu_rootconf.9
diff -u src/share/man/man9/cpu_rootconf.9:1.5 src/share/man/man9/cpu_rootconf.9:1.6
--- src/share/man/man9/cpu_rootconf.9:1.5 Wed Apr 30 13:10:58 2008
+++ src/share/man/man9/cpu_rootconf.9 Tue Apr 13 07:32:31 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: cpu_rootconf.9,v 1.5 2008/04/30 13:10:58 martin Exp $
+.\" $NetBSD: cpu_rootconf.9,v 1.6 2010/04/13 07:32:31 jruoho Exp $
.\"
.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,26 +27,36 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 24, 2002
+.Dd April 13, 2010
.Dt CPU_ROOTCONF 9
.Os
.Sh NAME
-.Nm cpu_rootconf
-.Nd machine-dependent root file system setup
+.Nm cpu_rootconf ,
+.Nm setroot
+.Nd root file system setup
.Sh SYNOPSIS
.In sys/types.h
.In sys/systm.h
.Ft void
.Fn cpu_rootconf "void"
+.Ft void
+.Fn setroot "device_t bootdv" "int bootpartition"
.Sh DESCRIPTION
+The
.Fn cpu_rootconf
-is the machine-dependent interface invoked during system bootstrap to
+is a machine-dependent interface invoked during system bootstrap to
determine the root file system device and initialize machine-dependent
file system state.
+.Pp
+The
.Fn cpu_rootconf
-invokes the machine-independent function
+function invokes the machine-independent
.Fn setroot
-to record the boot/root device and the boot partition information for
-use in machine-independent code.
+function to record the boot/root device
+.Fa bootdv
+and the boot partition information
+.Fa bootpartition
+for use in machine-independent code.
.Sh SEE ALSO
-.Xr setroot 9
+.Xr boot 8 ,
+.Xr boothowto 9
