From 2978284dad56ab71b701fedd9754cdd24e8d06ab Mon Sep 17 00:00:00 2001 From: Allan Jude Date: Fri, 29 May 2015 20:16:40 +0000 Subject: [PATCH] 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. --- .../books/handbook/jails/chapter.xml | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/en_US.ISO8859-1/books/handbook/jails/chapter.xml b/en_US.ISO8859-1/books/handbook/jails/chapter.xml index 308b4b3c0d..a418e60119 100644 --- a/en_US.ISO8859-1/books/handbook/jails/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/jails/chapter.xml @@ -1294,14 +1294,34 @@ Retype New Password: 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: + available with this method. + + 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. - &prompt.root; ezjail-admin update -r + &prompt.root; ezjail-admin update -u - After updating the basejail, &man.mergemaster.8; can be - run to update each jail's configuration files. + To upgrade the basejail to a new version, first + upgrade the host system as described in . 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: + + &prompt.root; file /usr/jails/basejail/bin/sh +/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 + + Now use this information to perform the upgrade from + 9.3-RELEASE to the current version of + the host system: + + &prompt.root; ezjail-admin update -U -s 9.3-RELEASE + + After updating the basejail, &man.mergemaster.8; must + be run to update each jail's configuration files. How to use &man.mergemaster.8; depends on the purpose and trustworthiness of a jail. If a jail's services or