|
Lines 1003-1009
Link Here
|
| 1003 |
can then build a new kernel based on your normal kernel configuration |
1003 |
can then build a new kernel based on your normal kernel configuration |
| 1004 |
file.</para> |
1004 |
file.</para> |
| 1005 |
|
1005 |
|
| 1006 |
<para>If you are upgrading to &os; 4.0 or above then the standard |
1006 |
<para>If you are upgrading to &os; 4.0 or above then the old |
| 1007 |
kernel build procedure (as described in <xref linkend="kernelconfig">) |
1007 |
kernel build procedure (as described in <xref linkend="kernelconfig">) |
| 1008 |
is deprecated. Instead, you should run these commands |
1008 |
is deprecated. Instead, you should run these commands |
| 1009 |
<emphasis>after</emphasis> you have <link |
1009 |
<emphasis>after</emphasis> you have <link |
|
Lines 1015-1021
Link Here
|
| 1015 |
&prompt.root; <userinput>make installkernel</userinput></screen> |
1015 |
&prompt.root; <userinput>make installkernel</userinput></screen> |
| 1016 |
|
1016 |
|
| 1017 |
<para>If you are upgrading to a version of &os; below 4.0 you should |
1017 |
<para>If you are upgrading to a version of &os; below 4.0 you should |
| 1018 |
use the standard kernel build procedure. However, it is recommended |
1018 |
use the old kernel build procedure. However, it is recommended |
| 1019 |
that you use the new version of &man.config.8;, using a command line |
1019 |
that you use the new version of &man.config.8;, using a command line |
| 1020 |
like this.</para> |
1020 |
like this.</para> |
| 1021 |
|
1021 |
|
|
Lines 1101-1123
Link Here
|
| 1101 |
to the ones currently installed in your system. At this point, files that |
1101 |
to the ones currently installed in your system. At this point, files that |
| 1102 |
differ will be shown in &man.diff.1; format, with the <option>+</option> sign |
1102 |
differ will be shown in &man.diff.1; format, with the <option>+</option> sign |
| 1103 |
representing added or modified lines, and <option>-</option> representing |
1103 |
representing added or modified lines, and <option>-</option> representing |
| 1104 |
lines that will be removed either completely, or replaced with a new line. |
1104 |
lines that will be either removed completely, or replaced with a new line. |
| 1105 |
See the &man.diff.1; manual page for more information about the &man.diff.1; |
1105 |
See the &man.diff.1; manual page for more information about the &man.diff.1; |
| 1106 |
syntax and how file differences are shown.</para> |
1106 |
syntax and how file differences are shown.</para> |
| 1107 |
|
1107 |
|
| 1108 |
<para>&man.mergemaster.8; will then show you each file that displays variances, |
1108 |
<para>&man.mergemaster.8; will then show you each file that displays variances, |
| 1109 |
and at this point you will have the option of either deleting the new file (referred |
1109 |
and at this point you will have the option of either deleting the new file (referred |
| 1110 |
to as the temporary file), install the temporary file in its unmodified state, |
1110 |
to as the temporary file), installing the temporary file in its unmodified state, |
| 1111 |
merge the temporary file with the currently installed file, or view the |
1111 |
merging the temporary file with the currently installed file, or viewing the |
| 1112 |
&man.diff.1; results again.</para> |
1112 |
&man.diff.1; results again.</para> |
| 1113 |
|
1113 |
|
| 1114 |
<para>Choosing to delete the temporary file will tell &man.mergemaster.8; that we |
1114 |
<para>Choosing to delete the temporary file will tell &man.mergemaster.8; that we |
| 1115 |
wish to keep our current file unchanged, and to delete the one that is |
1115 |
wish to keep our current file unchanged, and to delete the new version. |
| 1116 |
new. This option is not the most recommended one, unless you see no |
1116 |
This option is not recommended, unless you see no |
| 1117 |
reason to change the current file. You can get help at any time by |
1117 |
reason to change the current file. You can get help at any time by |
| 1118 |
typing <option>?</option> at the mergemaster prompt. If the user should |
1118 |
typing <option>?</option> at the mergemaster prompt. If the user |
| 1119 |
choose to skip a file, it will be presented again after all other files |
1119 |
chooses to skip a file, it will be presented again after all other files |
| 1120 |
have been worked with.</para> |
1120 |
have been dealt with.</para> |
| 1121 |
|
1121 |
|
| 1122 |
<para>Choosing to install the unmodified temporary file will replace the |
1122 |
<para>Choosing to install the unmodified temporary file will replace the |
| 1123 |
current file with the new one. For most unmodified files, this is the best |
1123 |
current file with the new one. For most unmodified files, this is the best |
|
Lines 1133-1145
Link Here
|
| 1133 |
installed. This option is customarily used for files where settings have been |
1133 |
installed. This option is customarily used for files where settings have been |
| 1134 |
modified by the user.</para> |
1134 |
modified by the user.</para> |
| 1135 |
|
1135 |
|
| 1136 |
<para>Choosing to view the diff results again, will show you the file differences |
1136 |
<para>Choosing to view the diff results again will show you the file differences |
| 1137 |
just like &man.mergemaster.8; did before prompting you for an option.</para> |
1137 |
just like &man.mergemaster.8; did before prompting you for an option.</para> |
| 1138 |
|
1138 |
|
| 1139 |
<para>After &man.mergemaster.8; is complete with the system files you will be |
1139 |
<para>After &man.mergemaster.8; is done with the system files you will be |
| 1140 |
prompted for other options. &man.mergemaster.8; will ask if you want to rebuild |
1140 |
prompted for other options. &man.mergemaster.8; may ask if you want to rebuild |
| 1141 |
the password file, run <filename>MAKEDEV</filename> and finishing up with a |
1141 |
the password file and/or run <filename>MAKEDEV</filename>, and will finish up with an option to |
| 1142 |
removal of the left over temporary files.</para> |
1142 |
remove left-over temporary files.</para> |
| 1143 |
</sect3> |
1143 |
</sect3> |
| 1144 |
|
1144 |
|
| 1145 |
<sect3> |
1145 |
<sect3> |