svn commit: r46733 - head/en_US.ISO8859-1/books/handbook/jails

[Allan Jude]

Author: allanjude
Date: Fri May 29 20:16:40 2015
New Revision: 46733
URL: https://svnweb.freebsd.org/changeset/doc/46733

Log:
  Fix incorrect instructions in ezjail upgrading section of the handbook
  
  There is no ezjail-update -r
  Explain how to upgrade between versions that different from the host version
  
  PR:		197804
  Differential Revision:	https://reviews.freebsd.org/D2114
  Approved by:	wblock (mentor)
  Sponsored by:	ScaleEngine Inc.

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

Modified: head/en_US.ISO8859-1/books/handbook/jails/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/jails/chapter.xml	Fri May 29 20:02:35 2015	(r46732)
+++ head/en_US.ISO8859-1/books/handbook/jails/chapter.xml	Fri May 29 20:16:40 2015	(r46733)
@@ -1294,14 +1294,34 @@ Retype New Password:</screen>
 	  updates have the same limitations as if
 	  &man.freebsd-update.8; were being run directly.  The most
 	  important one is that only -RELEASE versions of &os; are
-	  available with this method.  To update the basejail to the
-	  latest patched release of the version of &os; on the host
-	  computer, use:</para>
+	  available with this method.</para>
+	
+	<para>Update the basejail to the latest patched release of
+	  the version of &os; on the host.  For example, updating from
+	  RELEASE-p1 to RELEASE-p2.</para>
+
+	<screen>&prompt.root; <userinput>ezjail-admin update -u</userinput></screen>
+
+	<para>To upgrade the basejail to a new version, first
+	  upgrade the host system as described in <xref
+	    linkend="freebsdupdate-upgrade" />.  Once the host has
+	  been upgraded and rebooted, the basejail can then be
+	  upgraded.  &man.freebsd-update.8; has no way of determining
+	  which version is currently installed in the basejail, so the
+	  original version must be specified.  Use &man.file.1; to
+	  determine the original version in the basejail:</para>
+
+	<screen>&prompt.root; <userinput>file /usr/jails/basejail/bin/sh</userinput>
+/usr/jails/basejail/bin/sh: ELF 64-bit LSB executable, x86-64, version 1 (FreeBSD), dynamically linked (uses shared libs), for FreeBSD 9.3, stripped</screen>
+
+	<para>Now use this information to perform the upgrade from
+	  <literal>9.3-RELEASE</literal> to the current version of
+	  the host system:</para>
 
-	<screen>&prompt.root; <userinput>ezjail-admin update -r</userinput></screen>
+	<screen>&prompt.root; <userinput>ezjail-admin update -U -s <replaceable>9.3-RELEASE</replaceable></userinput></screen>
 
-	<para>After updating the basejail, &man.mergemaster.8; can be
-	  run to update each jail's configuration files.</para>
+	<para>After updating the basejail, &man.mergemaster.8; must
+	  be run to update each jail's configuration files.</para>
 
 	<para>How to use &man.mergemaster.8; depends on the purpose
 	  and trustworthiness of a jail.  If a jail's services or