From: Antonio Huete <tuxillo@quantumachine.net>
Date: Tue, 20 Oct 2009 09:21:04 +0000 (+0200)
Subject: loader(8): Add multi-root selection documentation.
X-Git-Tag: v2.7.1~457
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/b27d3d3b0fa894f50675487f8cfdac39d7e5c0c2

loader(8): Add multi-root selection documentation.
---

diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index b74adce63d..0e9bc51011 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -27,7 +27,7 @@
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
-.Dd September 6, 2008
+.Dd October 20, 2009
 .Dt LOADER 8
 .Os
 .Sh NAME
@@ -540,11 +540,25 @@ Overrides the compile-time set value of
 or the preset default of 512.
 Must be a power of 2.
 .It Va vfs.root.mountfrom
-File system type and partition, separated by colon,
-for kernel root file system.
-Used with boot-only partition, which is typically mounted on root file system as
+A semicolon separated list of partitions to try
+as the kernel root file system.
+Device format is file system type and partition,
+separated by colon.
+Used with boot-only partition, which is
+typically mounted on root file system as
 .Pa /boot .
-Example: "hammer:da8s1a"
+.Bl -hyphen
+.It
+One device example: "hammer:da8s1a"
+.It
+Several devices example: "ufs:da0s1a;hammer:ad1s1d"
+.El
+.Pp
+Each device in the list will be tried in the order specified
+until the mount succeeds.
+If all fail, the
+.Li mountroot>
+prompt is displayed for manual entry.
 .Pp
 You may not specify devtab labels here but you can specify paths available
 to devfs such as "hammer:serno/L41JYE0G.s1d".
diff --git a/sys/boot/forth/loader-bootp.conf b/sys/boot/forth/loader-bootp.conf
index 18637f80e8..42cdeb6c3c 100644
--- a/sys/boot/forth/loader-bootp.conf
+++ b/sys/boot/forth/loader-bootp.conf
@@ -101,7 +101,8 @@ module_path="/boot;/boot/modules;/;/modules"	# Set the module search path
 #kern.vm.kmem.size=""		# Sets the size of kernel memory (bytes)
 #net.inet.tcp.tcbhashsize=""	# Set the value of TCBHASHSIZE
 #vfs.root.mountfrom=""		# Specify root partition in a way the
-				# kernel understands
+				# kernel understands. You can specify a semicolon
+				# separated device list which will be tried.
 #debug.ktr.verbose="1"		# Enable console dump of KTR events
 #net.graph.maxalloc="128"	# Maximum number of queue items to allocate
 #net.graph.ngqfreemax="64"	# Maximum number of free queue items to cache
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 44d44754a7..ace3780a0c 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -103,7 +103,8 @@ module_path="/boot;/boot/modules;/;/modules"	# Set the module search path
 #kern.vm.kmem.size=""		# Sets the size of kernel memory (bytes)
 #net.inet.tcp.tcbhashsize=""	# Set the value of TCBHASHSIZE
 #vfs.root.mountfrom=""		# Specify root partition in a way the
-				# kernel understands
+				# kernel understands. You can specify a semicolon
+				# separated device list which will be tried.
 #debug.ktr.verbose="1"		# Enable console dump of KTR events
 #net.graph.maxalloc="128"	# Maximum number of queue items to allocate
 #net.graph.ngqfreemax="64"	# Maximum number of free queue items to cache