svn commit: r42688 - head/en_US.ISO8859-1/books/handbook/cutting-edge

[Sean Bruno]

Author: sbruno (src committer)
Date: Mon Sep 23 13:11:09 2013
New Revision: 42688
URL: http://svnweb.freebsd.org/changeset/doc/42688

Log:
  Document the zfs method of remounting your rootfs during single user mode
  to allow mergemaster to do its business.  Everyone seems to know how to do
  this, but it would be nice to let new folks have a clue.
  
  Reviewed by:	gjb

Modified:
  head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Sun Sep 22 20:22:25 2013	(r42687)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Mon Sep 23 13:11:09 2013	(r42688)
@@ -1918,11 +1918,22 @@ Fetching 133 new ports or files... done.
 
       <para>After <maketarget>installkernel</maketarget> finishes
 	successfully, boot into single user mode using <command>boot
-	  -s</command> from the loader prompt.  Then run:</para>
+	  -s</command> from the loader prompt.</para>
+
+	<para>If using UFS, run:</para>
+
 
       <screen>&prompt.root; <userinput>mount -u /</userinput>
-&prompt.root; <userinput>mount -a -t ufs</userinput>
-&prompt.root; <userinput>adjkerntz -i</userinput>
+&prompt.root; <userinput>mount -a -t ufs</userinput></screen>
+
+      <para>If using ZFS(assuming a zpool name of zroot), run:</para>
+
+      <screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput>
+&prompt.root; <userinput>zfs mount -a</userinput></screen>
+
+      <para>Then run:</para>
+
+       <screen>&prompt.root; <userinput>adjkerntz -i</userinput>
 &prompt.root; <userinput>mergemaster -p</userinput>
 &prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make installworld</userinput>