White space fix only. Translators can ignore.

Sponsored by: iXsystems
This commit is contained in:
Dru Lavigne 2014-02-06 01:58:10 +00:00
parent 7843d93cf1
commit e85f1751ed
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=43797

View file

@ -1444,46 +1444,48 @@ before running "/usr/sbin/freebsd-update install"</screen>
perform the following tasks:</para> perform the following tasks:</para>
<procedure> <procedure>
<title>Perform These Tasks <emphasis>Before</emphasis> Building World</title> <title>Perform These Tasks <emphasis>Before</emphasis>
Building World</title>
<step> <step>
<para>Backup all important data to another system or removable <para>Backup all important data to another system or removable
media, verify the integrity of the backup, and have a bootable media, verify the integrity of the backup, and have a
installation media at hand. It cannot be bootable installation media at hand. It cannot be stressed
stressed enough how important it is to make a enough how important it is to make a backup of the system
backup of the system <emphasis>before</emphasis> rebuilding <emphasis>before</emphasis> rebuilding the system. While
the system. While rebuilding world is an easy task, there rebuilding world is an easy task, there will inevitably be
will inevitably be times when mistakes in the source tree times when mistakes in the source tree render the system
render the system unbootable. You will probably never have unbootable. You will probably never have to use the backup,
to use the backup, but it is better to be safe than sorry!</para> but it is better to be safe than sorry!</para>
</step> </step>
<step> <step>
<indexterm><primary>mailing list</primary></indexterm> <indexterm><primary>mailing list</primary></indexterm>
<para>Review the recent &a.stable.name; or &a.current.name; entries, depending <para>Review the recent &a.stable.name; or &a.current.name;
upon the branch being tracked. Be aware of any known entries, depending upon the branch being tracked. Be aware
problems and which systems are affected. If a known issue of any known problems and which systems are affected. If a
affects the version of synchronized code, wait for an <quote>all known issue affects the version of synchronized code, wait
clear</quote> announcement to be posted stating that the problem has for an <quote>all clear</quote> announcement to be posted
been solved. Resynchronize the sources to ensure that the stating that the problem has been solved. Resynchronize the
local version of source has the needed fix.</para> sources to ensure that the local version of source has the
</step> needed fix.</para>
</step>
<step> <step>
<para>Read <para>Read <filename>/usr/src/UPDATING</filename> for any
<filename>/usr/src/UPDATING</filename> for any pre-buildworld pre-buildworld steps necessary for that version of the
steps necessary for that version of the source. This file contains source. This file contains important information about
important information about potential problems and may specify potential problems and may specify the order to run certain
the order to run certain commands. Many upgrades require commands. Many upgrades require specific additional steps
specific additional steps such as renaming or deleting such as renaming or deleting specific files prior to
specific files prior to installworld. These will be listed installworld. These will be listed at the end of this file
at the end of this file where the currently recommended upgrade sequence where the currently recommended upgrade sequence is
is explicitly spelled out. If explicitly spelled out. If
<filename>UPDATING</filename> contradicts any steps in <filename>UPDATING</filename> contradicts any steps in this
this chapter, the instructions in <filename>UPDATING</filename> take chapter, the instructions in <filename>UPDATING</filename>
precedence and should be followed.</para> take precedence and should be followed.</para>
</step> </step>
</procedure> </procedure>
<warning> <warning>
<title>Do Not Use <command>make world</command></title> <title>Do Not Use <command>make world</command></title>
@ -1499,44 +1501,47 @@ before running "/usr/sbin/freebsd-update install"</screen>
<sect2 xml:id="canonical-build"> <sect2 xml:id="canonical-build">
<title>Overview of Process</title> <title>Overview of Process</title>
<para>The build world process assumes an upgrade from an older &os; <para>The build world process assumes an upgrade from an older
version using the source of a newer &os; version using the source of a newer version that was
version that was obtained using the instructions in obtained using the instructions in
<xref linkend="synching"/>.</para> <xref linkend="synching"/>.</para>
<para>In &os;, the term <quote>world</quote> includes the kernel, core system binaries, <para>In &os;, the term <quote>world</quote> includes the
libraries, programming files, and built-in compiler. The order in which these kernel, core system binaries, libraries, programming files,
components are built and installed is important.</para> and built-in compiler. The order in which these components
are built and installed is important.</para>
<para>For example, the old compiler might have a bug and not be able to <para>For example, the old compiler might have a bug and not be
compile the new kernel. Since the new kernel should be able to compile the new kernel. Since the new kernel should
built with the new compiler, the new compiler be built with the new compiler, the new compiler must be
must be built, but not necessarily installed, before the new kernel is built.</para> built, but not necessarily installed, before the new kernel is
built.</para>
<para>The new world might rely on new kernel features, <para>The new world might rely on new kernel features, so the
so the new kernel must be installed before the new world is new kernel must be installed before the new world is
installed. The old world might not run correctly on the new installed. The old world might not run correctly on the new
kernel, so the new world must be installed immediately kernel, so the new world must be installed immediately upon
upon installing the new kernel.</para> installing the new kernel.</para>
<para>Some configuration changes must be made before the new <para>Some configuration changes must be made before the new
world is installed, but others might break the old world. world is installed, but others might break the old world.
Hence, two different configuration upgrade steps are Hence, two different configuration upgrade steps are used.
used. For the most part, the update process only replaces or For the most part, the update process only replaces or adds
adds files and existing old files are not deleted. Since files and existing old files are not deleted. Since this can
this can cause problems, <filename>/usr/src/UPDATING</filename> cause problems, <filename>/usr/src/UPDATING</filename> will
will indicate if any files indicate if any files need to be manually deleted and at which
need to be manually deleted and at which step to do so.</para> step to do so.</para>
<para>These concerns have led to the recommended upgrade <para>These concerns have led to the recommended upgrade
sequence described in sequence described in
the following procedure.</para> the following procedure.</para>
<procedure> <procedure>
<title>Overview of Build World Process</title> <title>Overview of Build World Process</title>
<para>The commands used in the build world process should be run in the order specified <para>The commands used in the build world process should be
here. This section summarizes the function of each command.</para> run in the order specified here. This section summarizes
the function of each command.</para>
<step> <step>
<para>Compile the new compiler and a few related <para>Compile the new compiler and a few related
@ -1549,62 +1554,63 @@ before running "/usr/sbin/freebsd-update install"</screen>
</step> </step>
<step> <step>
<para>Use the new compiler <para>Use the new compiler residing in <filename
residing in <filename class="directory">/usr/obj</filename> class="directory">/usr/obj</filename> to build the new
to build the new kernel, in order to kernel, in order to protect against compiler-kernel
protect against compiler-kernel mismatches:</para> mismatches:</para>
<screen>&prompt.root; <userinput>make buildkernel</userinput></screen> <screen>&prompt.root; <userinput>make buildkernel</userinput></screen>
</step> </step>
<step> <step>
<para>Install the new kernel and kernel modules, <para>Install the new kernel and kernel modules, making it
making it possible to boot with the newly updated possible to boot with the newly updated kernel:</para>
kernel:</para>
<screen>&prompt.root; <userinput>make installkernel</userinput></screen> <screen>&prompt.root; <userinput>make installkernel</userinput></screen>
</step> </step>
<step> <step>
<para>Drop the system into single user mode in order to minimize problems from updating <para>Drop the system into single user mode in order to
any binaries that are already running. It also minimizes any minimize problems from updating any binaries that are
problems from running the old world on a new already running. It also minimizes any problems from
kernel.</para> running the old world on a new kernel.</para>
<screen>&prompt.root; <userinput>shutdown now</userinput></screen> <screen>&prompt.root; <userinput>shutdown now</userinput></screen>
<para>Once in single-user mode, run this command if the <para>Once in single-user mode, run this command if the
system is formatted with UFS:</para> system is formatted with UFS:</para>
<screen>&prompt.root; <userinput>mount -u /</userinput> <screen>&prompt.root; <userinput>mount -u /</userinput>
&prompt.root; <userinput>mount -a -t ufs</userinput></screen> &prompt.root; <userinput>mount -a -t ufs</userinput></screen>
<para>If the system is instead formatted with ZFS, run these <para>If the system is instead formatted with ZFS, run these
two commands. This example assumes a zpool name of <literal>zroot</literal>:</para> two commands. This example assumes a zpool name of
<literal>zroot</literal>:</para>
<screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput> <screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput>
&prompt.root; <userinput>zfs mount -a</userinput></screen> &prompt.root; <userinput>zfs mount -a</userinput></screen>
</step> </step>
<step> <step>
<para>Then, for either filesystem, run:</para> <para>Then, for either filesystem, run:</para>
<screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen> <screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
</step> </step>
<step> <step>
<para>Next, perform some initial configuration file updates in <para>Next, perform some initial configuration file updates
preparation for the new world. For instance, this step may add in preparation for the new world. For instance, this step
new groups or new system accounts which have been added may add new groups or new system accounts which have been
to &os; since the last update. This is necessary so that the added to &os; since the last update. This is necessary so
<buildtarget>installworld</buildtarget> step will be able that the <buildtarget>installworld</buildtarget> step will
to use the new system accounts and groups.</para> be able to use the new system accounts and groups.</para>
<screen>&prompt.root; <userinput>mergemaster -p</userinput></screen> <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
</step> </step>
<step> <step>
<para>Install the new world <para>Install the new world from <filename
from <filename class="directory">/usr/obj</filename>.</para> class="directory">/usr/obj</filename>.</para>
<screen>&prompt.root; <userinput>cd /usr/src</userinput> <screen>&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make installworld</userinput></screen> &prompt.root; <userinput>make installworld</userinput></screen>
@ -1617,26 +1623,25 @@ before running "/usr/sbin/freebsd-update install"</screen>
</step> </step>
<step> <step>
<para>Delete any obsolete files. This is <para>Delete any obsolete files. This is important as they
important as they may cause problems if left on may cause problems if left on the disk.</para>
the disk.</para>
<screen>&prompt.root; <userinput>make delete-old</userinput></screen> <screen>&prompt.root; <userinput>make delete-old</userinput></screen>
</step> </step>
<step> <step>
<para>A full reboot is now needed to load the new <para>A full reboot is now needed to load the new kernel and
kernel and new world with the new configuration files.</para> new world with the new configuration files.</para>
<screen>&prompt.root; <userinput>reboot</userinput></screen> <screen>&prompt.root; <userinput>reboot</userinput></screen>
</step> </step>
<step> <step>
<para>Make sure that all installed ports have first been rebuilt <para>Make sure that all installed ports have first been
before old libraries are removed using the instructions in rebuilt before old libraries are removed using the
<xref linkend="ports-upgrading"/>. When finished, instructions in <xref linkend="ports-upgrading"/>. When
remove any obsolete libraries to avoid conflicts with finished, remove any obsolete libraries to avoid conflicts
newer ones.</para> with newer ones.</para>
<screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen> <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
</step> </step>