svn commit: r366626 - head/sbin/reboot

[Toomas Soome]

Please note, the remove is done by rc script during the boot. Also nextboot.conf not generic configuration file (such as loader.conf or loader.conf.local), but the implementation specific file, part of special feature. That is, one should not assume the presence of nextboot.conf file, make assumptions about its content, or perform manual edits on it.

Rgds,
Toomas

> On 11. Oct 2020, at 13:40, Alexey Dokuchaev <danfe at freebsd.org> wrote:
> 
> Author: danfe (ports committer)
> Date: Sun Oct 11 10:40:11 2020
> New Revision: 366626
> URL: https://svnweb.freebsd.org/changeset/base/366626
> 
> Log:
>  The nextboot(8) manual page currently says that the loader(8) would delete
>  the /boot/nextboot.conf file or its contents which is 1) not the most user-
>  friendly way of working with custom configurations, and 2) simply not true
>  for both Forth and Lua implementations: they would not delete it, but just
>  change the setting to "NO", that is, disable it.
> 
>  While at it, add one missing serial (Oxford) comma and fix some bogus line
>  wraps along the way.
> 
>  Approved by:    bcr (manpages)
>  Differential Revision:    https://reviews.freebsd.org/D25971
> 
> Modified:
>  head/sbin/reboot/nextboot.8
> 
> Modified: head/sbin/reboot/nextboot.8
> ==============================================================================
> --- head/sbin/reboot/nextboot.8    Sun Oct 11 09:05:13 2020    (r366625)
> +++ head/sbin/reboot/nextboot.8    Sun Oct 11 10:40:11 2020    (r366626)
> @@ -24,7 +24,7 @@
> .\"
> .\" $FreeBSD$
> .\"
> -.Dd September 19, 2020
> +.Dd October 11, 2020
> .Dt NEXTBOOT 8
> .Os
> .Sh NAME
> @@ -41,14 +41,14 @@
> .Sh DESCRIPTION
> The
> .Nm
> -utility allows specifying some combination of an alternate kernel, boot flags
> -and kernel environment for the
> -next time the machine is booted.
> +utility allows specifying some combination of an alternate kernel, boot
> +flags, and kernel environment for the next time the machine is booted.
> Once the
> .Xr loader 8
> -loads in the new kernel
> -information, it is deleted so in case the new kernel hangs the machine,
> -once it is rebooted, the machine will automatically revert to its previous
> +loads in the new kernel information from the
> +.Pa /boot/nextboot.conf
> +file, it is disabled so in case the new kernel hangs the machine, once
> +it is rebooted, the machine will automatically revert to its previous
> configuration.
> .Pp
> The options are as follows: