os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Describe when it may be necessary to run mergemaster before

Browse source 
'make buildworld'.  In rare cases, mergemaster may need to be
run twice: one time before buildworld (to update /etc/group
or any other files required for a successful buildworld) and
one time after installworld (to merge all the src/etc updates
to the /etc directory of the system).

Point to /usr/src/UPDATING for details of when and why this
is necessary.

Hopefully, this will reduce the potential for confusion when
users read about mergemaster in the Handbook.

PR:		docs/74231
Submitted by:	Brian Candler <b.candler@pobox.com>
This commit is contained in:
Giorgos Keramidas 2004-12-23 16:47:15 +00:00
parent fa32853a93
commit 19117e0f37
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=23331
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
View file

@ -602,7 +602,9 @@
<sect2>
<title>The Canonical Way to Update Your System</title>
<para>To update your system, you should use the following
<para>To update your system, you should check
<filename>/usr/src/UPDATING</filename> for any pre-buildworld steps
necessary for your version of the sources and then use the following
procedure:</para>
<screen>&prompt.root; <userinput>make buildworld</userinput>
@ -610,9 +612,19 @@
&prompt.root; <userinput>make installkernel</userinput>
&prompt.root; <userinput>reboot</userinput></screen>
<para>You should boot in single user mode (using
<command>boot -s</command> from loader prompt for
example). Then run:</para>
<note>
<para>There are a few rare cases when an extra run of
<command>mergemaster -p</command> is needed before the
<maketarget>buildworld</maketarget> step. These are
described in <filename>UPDATING</filename>. In general,
though, you can safely ommit this step if you are not
updating across one or more major &os; versions.</para>
</note>
<para>After <maketarget>installkernel</maketarget> finishes
successfully, you should boot in single user mode
(i.e.&nbsp;using <command>boot -s</command> from the loader
prompt). Then run:</para>
<screen>&prompt.root; <userinput>mergemaster -p</userinput>
&prompt.root; <userinput>make installworld</userinput>