|
Lines 1813-1820
Link Here
|
| 1813 |
up-to-date, refer to <xref linkend="synching"/> for detailed |
1813 |
up-to-date, refer to <xref linkend="synching"/> for detailed |
| 1814 |
help about synchronizing to a newer version.</para> |
1814 |
help about synchronizing to a newer version.</para> |
| 1815 |
|
1815 |
|
| 1816 |
<para>Updating the system from source is a more subtle than |
1816 |
<para>Updating the system from source is a more subtle process |
| 1817 |
it might initially seem to be, and the &os; developers have |
1817 |
than it might initially seem to be, and the &os; developers have |
| 1818 |
found it necessary over the years to change the recommended |
1818 |
found it necessary over the years to change the recommended |
| 1819 |
approach fairly dramatically as new kinds of unavoidable |
1819 |
approach fairly dramatically as new kinds of unavoidable |
| 1820 |
dependencies come to light. The rest of this section |
1820 |
dependencies come to light. The rest of this section |
|
Lines 1858-1864
Link Here
|
| 1858 |
</listitem> |
1858 |
</listitem> |
| 1859 |
|
1859 |
|
| 1860 |
<listitem> |
1860 |
<listitem> |
| 1861 |
<para>Some configuration changes must be done before the new |
1861 |
<para>Some configuration changes must be made before the new |
| 1862 |
world is installed, but others might break the old world. |
1862 |
world is installed, but others might break the old world. |
| 1863 |
Hence, two different configuration upgrade steps are |
1863 |
Hence, two different configuration upgrade steps are |
| 1864 |
generally needed.</para> |
1864 |
generally needed.</para> |
|
Lines 1946-1952
Link Here
|
| 1946 |
<para><command>mergemaster</command></para> |
1946 |
<para><command>mergemaster</command></para> |
| 1947 |
|
1947 |
|
| 1948 |
<para>Repeated to update the remaining configuration files, |
1948 |
<para>Repeated to update the remaining configuration files, |
| 1949 |
not that the new world is on disk.</para> |
1949 |
now that the new world is on disk.</para> |
| 1950 |
</listitem> |
1950 |
</listitem> |
| 1951 |
|
1951 |
|
| 1952 |
<listitem> |
1952 |
<listitem> |
|
Lines 2217-2223
Link Here
|
| 2217 |
<para><emphasis>Do not</emphasis> save the output in <filename |
2217 |
<para><emphasis>Do not</emphasis> save the output in <filename |
| 2218 |
class="directory">/tmp</filename> as this directory may be |
2218 |
class="directory">/tmp</filename> as this directory may be |
| 2219 |
cleared at next reboot. A better place to save the file is |
2219 |
cleared at next reboot. A better place to save the file is |
| 2220 |
<filename class="directory">/var/tmp</filename>or in |
2220 |
<filename class="directory">/var/tmp</filename> or in |
| 2221 |
<username>root</username>'s home directory.</para> |
2221 |
<username>root</username>'s home directory.</para> |
| 2222 |
</sect3> |
2222 |
</sect3> |
| 2223 |
|
2223 |
|
|
Lines 2234-2241
Link Here
|
| 2234 |
<para>To rebuild the world, use &man.make.1;. This command |
2234 |
<para>To rebuild the world, use &man.make.1;. This command |
| 2235 |
reads instructions from the <filename>Makefile</filename>, |
2235 |
reads instructions from the <filename>Makefile</filename>, |
| 2236 |
which describes how the programs that comprise &os; should |
2236 |
which describes how the programs that comprise &os; should |
| 2237 |
be rebuilt and the order in which they should be |
2237 |
be built and the order in which they should be built.</para> |
| 2238 |
built.</para> |
|
|
| 2239 |
|
2238 |
|
| 2240 |
<para>The general format of the command is as follows:</para> |
2239 |
<para>The general format of the command is as follows:</para> |
| 2241 |
|
2240 |
|
|
Lines 2542-2548
Link Here
|
| 2542 |
<sect3> |
2541 |
<sect3> |
| 2543 |
<title>Manual Update</title> |
2542 |
<title>Manual Update</title> |
| 2544 |
|
2543 |
|
| 2545 |
<para>To instead perform the update manually, do not just copy |
2544 |
<para>To perform the update manually instead, do not just copy |
| 2546 |
over the files from |
2545 |
over the files from |
| 2547 |
<filename class="directory">/usr/src/etc</filename> to |
2546 |
<filename class="directory">/usr/src/etc</filename> to |
| 2548 |
<filename class="directory">/etc</filename> and expect it to |
2547 |
<filename class="directory">/etc</filename> and expect it to |
|
Lines 2580-2586
Link Here
|
| 2580 |
|
2579 |
|
| 2581 |
<para>Next, build a dummy set of directories to install the |
2580 |
<para>Next, build a dummy set of directories to install the |
| 2582 |
new <filename class="directory">/etc</filename> and other |
2581 |
new <filename class="directory">/etc</filename> and other |
| 2583 |
files into. <filename |
2582 |
files into <filename |
| 2584 |
class="directory">/var/tmp/root</filename> is a reasonable |
2583 |
class="directory">/var/tmp/root</filename> is a reasonable |
| 2585 |
choice:</para> |
2584 |
choice:</para> |
| 2586 |
|
2585 |
|
|
Lines 2898-2904
Link Here
|
| 2898 |
<listitem> |
2897 |
<listitem> |
| 2899 |
<para>Turn off profiling by setting |
2898 |
<para>Turn off profiling by setting |
| 2900 |
<quote>NO_PROFILE=true</quote> in |
2899 |
<quote>NO_PROFILE=true</quote> in |
| 2901 |
<filename>/etc/make.conf</filename>).</para> |
2900 |
<filename>/etc/make.conf</filename>.</para> |
| 2902 |
</listitem> |
2901 |
</listitem> |
| 2903 |
|
2902 |
|
| 2904 |
<listitem> |
2903 |
<listitem> |