Changeset View
Standalone View
en_US.ISO8859-1/books/handbook/jails/chapter.xml
| Show First 20 Lines • Show All 1,307 Lines • ▼ Show 20 Lines | <para>If the world has already been compiled on the host, | ||||
| install it in the basejail with:</para> | install it in the basejail with:</para> | ||||
| <screen>&prompt.root; <userinput>ezjail-admin update -i</userinput></screen> | <screen>&prompt.root; <userinput>ezjail-admin update -i</userinput></screen> | ||||
| <para>Binary updates use &man.freebsd-update.8;. These | <para>Binary updates use &man.freebsd-update.8;. These | ||||
| updates have the same limitations as if | updates have the same limitations as if | ||||
| &man.freebsd-update.8; were being run directly. The most | &man.freebsd-update.8; were being run directly. The most | ||||
| important one is that only -RELEASE versions of &os; are | important one is that only -RELEASE versions of &os; are | ||||
| available with this method. To update the basejail to the | available with this method.</para> | ||||
| latest patched release of the version of &os; on the host | |||||
| computer, use:</para> | |||||
| <screen>&prompt.root; <userinput>ezjail-admin update -r</userinput></screen> | <para>Update the basejail to the latest patched release of | ||||
| the version of &os; on the host. For example, updating from | |||||
wblock: The "for example" is a separate sentence (an aside, really), and should not be tacked onto the… | |||||
Not Done Inline ActionsComma needed after "For example". wblock: Comma needed after "For example". | |||||
| RELEASE-p1 to RELEASE-p2.</para> | |||||
Not Done Inline ActionsOne of the goals of this section was avoiding literal revision numbers because the document would become so quickly obsolete. A version of the original wording can probably be used here. It is also important to distinguish upgrading the basejail from the individual jails. wblock: One of the goals of this section was avoiding literal revision numbers because the document… | |||||
| <para>After updating the basejail, &man.mergemaster.8; can be | <screen>&prompt.root; <userinput>ezjail-admin update -u</userinput></screen> | ||||
| run to update each jail's configuration files.</para> | |||||
| <para>To upgrade the basejail to a new version, first | |||||
Not Done Inline ActionsAgain, it is the basejail that is being upgraded. The description here should make it clear that the upgrade is to a new release rather than just the latest version of the installed release. wblock: Again, it is the basejail that is being upgraded. The description here should make it clear… | |||||
Done Inline ActionsThe rest of this section uses "update" rather than "upgrade". Also, "between versions" is confusing. "to a new version", maybe? wblock: The rest of this section uses "update" rather than "upgrade".
Also, "between versions" is… | |||||
| 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 | |||||
Done Inline ActionsThis "the blahblah utility" construct is not necessary. We don't say "use the cp utility to copy files", just "use cp to copy files". &man.freebsd-update.8; has no way of determining wblock: This "the blahblah utility" construct is not necessary. We don't say "use the cp utility to… | |||||
| which version is currently installed in the basejail, so the | |||||
Done Inline Actionswhich version is currently installed in the basejail, so the wblock: //which// version //is// currently installed in the basejail, so the | |||||
| original version must be specified. Use &man.file.1; to | |||||
Not Done Inline Actions"version to upgrade from" is awkward. Maybe "version currently installed in the basejail". wblock: "version to upgrade from" is awkward. Maybe "version currently installed in the basejail". | |||||
Done Inline Actions"as part of the command" is redundant. There is nowhere else to specify it. wblock: "as part of the command" is redundant. There is nowhere else to specify it. | |||||
| determine the original version in the basejail:</para> | |||||
Done Inline ActionsUse &man.file.1; to determine the original wblock: Use &man.file.1; to determine the original | |||||
Not Done Inline Actions"of &os;" is redundant. wblock: "of &os;" is redundant.
Again, it's important to be precise in the difference between the… | |||||
Done Inline Actions"that was installed" is not needed. wblock: "that was installed" is not needed. | |||||
| <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> | |||||
Not Done Inline Actions<literal> on the literal release string. Avoid "your": "to the current version installed on the host system" wblock: <literal> on the literal release string.
Avoid "your": "to the current version installed on… | |||||
Not Done Inline Actions<literal> on this 9.3-RELEASE wblock: <literal> on this 9.3-RELEASE | |||||
| <screen>&prompt.root; <userinput>ezjail-admin update -U -s <replaceable>9.3-RELEASE</replaceable></userinput></screen> | |||||
Done Inline Actions<replaceable> on this 9.3-RELEASE, because this is the one the user is expected to replace when they type it. wblock: <replaceable> on this 9.3-RELEASE, because this is the one the user is expected to replace when… | |||||
| <para>After updating the basejail, &man.mergemaster.8; must | |||||
Not Done Inline ActionsDoes this mergemaster step still apply to the added freebsd-update instructions? wblock: Does this mergemaster step still apply to the added freebsd-update instructions? | |||||
Not Done Inline ActionsYes, because the mergemaster step needs to be done on each jail, whereas freebsd-update is applied to the basejail allanjude: Yes, because the mergemaster step needs to be done on each jail, whereas freebsd-update is… | |||||
| be run to update each jail's configuration files.</para> | |||||
Not Done Inline ActionsHow about "must be run" rather than "needs to be"? wblock: How about "must be run" rather than "needs to be"? | |||||
| <para>How to use &man.mergemaster.8; depends on the purpose | <para>How to use &man.mergemaster.8; depends on the purpose | ||||
| and trustworthiness of a jail. If a jail's services or | and trustworthiness of a jail. If a jail's services or | ||||
| users are not trusted, then &man.mergemaster.8; should only | users are not trusted, then &man.mergemaster.8; should only | ||||
| be run from within that jail:</para> | be run from within that jail:</para> | ||||
| <example xml:id="jails-ezjail-update-mergemaster-untrusted"> | <example xml:id="jails-ezjail-update-mergemaster-untrusted"> | ||||
| <title>&man.mergemaster.8; on Untrusted Jail</title> | <title>&man.mergemaster.8; on Untrusted Jail</title> | ||||
| ▲ Show 20 Lines • Show All 293 Lines • Show Last 20 Lines | |||||
The "for example" is a separate sentence (an aside, really), and should not be tacked onto the first.