Include the system reboot step in the upgrading quick start in

order to match the instructions outlined in /usr/src/UPDATING.

Noticed by:	emaste
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2017-05-23 17:54:34 +00:00
parent 30bce65bdb
commit e51fbc9582
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=50272

View file

@ -1097,6 +1097,7 @@ before running "/usr/sbin/freebsd-update install"</screen>
&prompt.root; <userinput>cd /usr/src</userinput> <co xml:id="updating-src-qs-cd"/>
&prompt.root; <userinput>make -j<replaceable>4</replaceable> buildworld</userinput> <co xml:id="updating-src-qs-buildworld"/>
&prompt.root; <userinput>make -j<replaceable>4</replaceable> kernel</userinput> <co xml:id="updating-src-qs-kernel"/>
&prompt.root; <userinput>shutdown -r now</userinput> <co xml:id="updating-src-qs-reboot"/>
&prompt.root; <userinput>make installworld</userinput> <co xml:id="updating-src-qs-installworld"/>
&prompt.root; <userinput>mergemaster -Ui</userinput> <co xml:id="updating-src-qs-mergemaster"/>
&prompt.root; <userinput>shutdown -r now</userinput> <co xml:id="updating-src-qs-shutdown"/></screen>
@ -1131,6 +1132,10 @@ before running "/usr/sbin/freebsd-update install"</screen>
<buildtarget>installkernel</buildtarget>.</para>
</callout>
<callout arearefs="updating-src-qs-reboot">
<para>Reboot the system to the new kernel.</para>
</callout>
<callout arearefs="updating-src-qs-installworld">
<para>Install the world.</para>
</callout>
@ -1404,13 +1409,21 @@ Working Copy Root Path: /usr/src
completed, the new kernel and world are installed:</para>
<screen>&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make installkernel installworld</userinput></screen>
&prompt.root; <userinput>make installkernel</userinput>
&prompt.root; <userinput>shutdown -r now</userinput>
&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make installworld</userinput>
&prompt.root; <userinput>shutdown -r now</userinput></screen>
<para>If a custom kernel was built, <varname>KERNCONF</varname>
must also be set to use the new custom kernel:</para>
<screen>&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make installkernel installworld KERNCONF=STORAGESERVER</userinput></screen>
&prompt.root; <userinput>make installkernel KERNCONF=STORAGESERVER</userinput>
&prompt.root; <userinput>shutdown -r now</userinput>
&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make installworld</userinput>
&prompt.root; <userinput>shutdown -r now</userinput></screen>
</sect2>
<sect2 xml:id="updating-src-completing">