From owner-svn-doc-all@FreeBSD.ORG  Mon Sep 23 13:11:09 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A3778F59;
 Mon, 23 Sep 2013 13:11:09 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 90B732B7E;
 Mon, 23 Sep 2013 13:11:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NDB9oH008281;
 Mon, 23 Sep 2013 13:11:09 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8NDB9Qx008280;
 Mon, 23 Sep 2013 13:11:09 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201309231311.r8NDB9Qx008280@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 23 Sep 2013 13:11:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42688 - head/en_US.ISO8859-1/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Sep 2013 13:11:09 -0000

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>