From ddec5ce072df4034eef0283c0094f6c2c648217a Mon Sep 17 00:00:00 2001
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sat, 21 Jun 2008 07:30:46 +0000
Subject: [PATCH] Update Question 10.12: - Mark up "Boot:" with <literal> -
 Mark up Enter with <keycap> - Add options to mount(8) (suggested by trhodes)
 - Add paragraphs about the case when system has insecure console or  
 encrypted partitions

Reviewed by:  trhodes, danger
Approved by:  gabor
---
 en_US.ISO8859-1/books/faq/book.sgml | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 6a400195da..3e073b17a4 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -6072,15 +6072,37 @@ options    SYSVMSG          # enable for messaging</programlisting>
         </question><answer>
 
           <para>Do not panic!  Restart the system, type
-            <userinput>boot -s</userinput> at the Boot: prompt to
+            <userinput>boot -s</userinput> at the <literal>Boot:</literal> prompt to
             enter Single User mode. At the question about the shell to
-            use, hit ENTER. You will be dropped to a &prompt.root;
-            prompt. Enter <command>mount -u /</command> to remount
+            use, hit <keycap>Enter</keycap>. You will be dropped to a &prompt.root;
+            prompt. Enter <command>mount -urw /</command> to remount
             your root filesystem read/write, then run <command>mount
             -a</command> to remount all the filesystems. Run
             <command>passwd root</command> to change the
             <username>root</username> password then run &man.exit.1;
             to continue booting.</para>
+
+	  <note>
+	    <para>If you are still prompted to give the
+	      <username>root</username> password when entering the Single
+	      User mode, it means that the console has been marked as
+	      <literal>insecure</literal> in
+	      <filename>/etc/ttys</filename>.  In this case it will be required to
+	      boot from an &os; installation disk,
+	      choose the <guimenuitem>Fixit</guimenuitem> shell from
+	      &man.sysinstall.8; and issue the commands mentioned
+	      above.</para>
+	  </note>
+
+	  <note>
+	    <para>If you cannot mount your root partition from Single
+	      User mode, it is possible that the partitions are
+	      encrypted and it is impossible to mount them without the
+	      access keys.  Your chances are depending on the chosen
+	      implementation.  For more information see the section
+	      about encrypted disks in the &os; <ulink
+		url="&url.books.handbook;/disks-encrypting.html">Handbook</ulink>.</para>
+	  </note>
         </answer>
       </qandaentry>