|
Lines 1060-1075
Link Here
|
| 1060 |
<para>Remaking the world will not update certain directories (in |
1060 |
<para>Remaking the world will not update certain directories (in |
| 1061 |
particular, <filename>/etc</filename>, <filename>/var</filename> and |
1061 |
particular, <filename>/etc</filename>, <filename>/var</filename> and |
| 1062 |
<filename>/usr</filename>) with new or changed configuration files.</para> |
1062 |
<filename>/usr</filename>) with new or changed configuration files.</para> |
| 1063 |
<indexterm><primary><command>mergemaster</command></primary></indexterm> |
|
|
| 1064 |
|
1063 |
|
| 1065 |
<para>The simplest way to update these files is to use |
1064 |
<para>The simplest way to update these files is to use |
| 1066 |
&man.mergemaster.8;, though it is possible to do it manually |
1065 |
&man.mergemaster.8;, though it is possible to do it manually |
| 1067 |
if you would prefer to do that. We strongly recommend you |
1066 |
if you would prefer to do that. Regardless of which way you |
| 1068 |
use &man.mergemaster.8;, however, and if you do then you |
1067 |
choose, be sure to make a backup of <filename>/etc</filename> in |
| 1069 |
can skip forward to the <link linkend="update-dev">next |
1068 |
case anything goes wrong.</para> |
| 1070 |
section</link>, since &man.mergemaster.8; is described below. |
1069 |
|
| 1071 |
Be sure to make a backup of |
1070 |
<sect3> |
| 1072 |
<filename>/etc</filename> in case anything goes wrong.</para> |
1071 |
<title><command>mergemaster</command></title> |
|
|
1072 |
<indexterm><primary><command>mergemaster</command></primary></indexterm> |
| 1073 |
|
1073 |
|
| 1074 |
<para>The &man.mergemaster.8; utility is a Bourne script that will |
1074 |
<para>The &man.mergemaster.8; utility is a Bourne script that will |
| 1075 |
aid you in determining the differences between your configuration files |
1075 |
aid you in determining the differences between your configuration files |
|
Lines 1128-1133
Link Here
|
| 1128 |
prompted for other options. &man.mergemaster.8; will ask if you want to rebuild |
1128 |
prompted for other options. &man.mergemaster.8; will ask if you want to rebuild |
| 1129 |
the password file, run <filename>MAKEDEV</filename> and finishing up with a |
1129 |
the password file, run <filename>MAKEDEV</filename> and finishing up with a |
| 1130 |
removal of the left over temporary files.</para> |
1130 |
removal of the left over temporary files.</para> |
|
|
1131 |
</sect3> |
| 1132 |
|
| 1133 |
<sect3> |
| 1134 |
<title>Manual Update</title> |
| 1131 |
|
1135 |
|
| 1132 |
<para>If you wish to do the update manually, however, |
1136 |
<para>If you wish to do the update manually, however, |
| 1133 |
you cannot just copy over the files from |
1137 |
you cannot just copy over the files from |
|
Lines 1139-1144
Link Here
|
| 1139 |
there are files that should be in <filename>/etc</filename> that are |
1143 |
there are files that should be in <filename>/etc</filename> that are |
| 1140 |
not in <filename>/usr/src/etc</filename>.</para> |
1144 |
not in <filename>/usr/src/etc</filename>.</para> |
| 1141 |
|
1145 |
|
|
|
1146 |
<para>If you are using &man.mergemaster.8; (as recommended), |
| 1147 |
you can skip forward to the <link linkend="update-dev">next |
| 1148 |
section</link>.</para> |
| 1149 |
|
| 1142 |
<para>The simplest way to do this by hand is to install the |
1150 |
<para>The simplest way to do this by hand is to install the |
| 1143 |
files into a new directory, and then work through them looking |
1151 |
files into a new directory, and then work through them looking |
| 1144 |
for differences.</para> |
1152 |
for differences.</para> |
|
Lines 1281-1286
Link Here
|
| 1281 |
|
1289 |
|
| 1282 |
<screen>&prompt.root; <userinput>mkdir /var/tmp/root-`date "+%Y%m%d"`</userinput></screen> |
1290 |
<screen>&prompt.root; <userinput>mkdir /var/tmp/root-`date "+%Y%m%d"`</userinput></screen> |
| 1283 |
</tip> |
1291 |
</tip> |
|
|
1292 |
</sect3> |
| 1284 |
</sect2> |
1293 |
</sect2> |
| 1285 |
|
1294 |
|
| 1286 |
<sect2 id="update-dev"> |
1295 |
<sect2 id="update-dev"> |