From owner-svn-src-head@freebsd.org Sun Oct 11 12:29:16 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 23F3D3F322D for ; Sun, 11 Oct 2020 12:29:16 +0000 (UTC) (envelope-from tsoome@me.com) Received: from st43p00im-zteg10063501.me.com (st43p00im-zteg10063501.me.com [17.58.63.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C8Lhq4lLHz48Qm for ; Sun, 11 Oct 2020 12:29:15 +0000 (UTC) (envelope-from tsoome@me.com) Received: from [10.5.251.89] (251-37-131-46.dyn.estpak.ee [46.131.37.251]) by st43p00im-zteg10063501.me.com (Postfix) with ESMTPSA id E2D05C803D2; Sun, 11 Oct 2020 12:20:19 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Toomas Soome Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r366626 - head/sbin/reboot Date: Sun, 11 Oct 2020 15:20:16 +0300 Message-Id: <8601CC07-3A43-461A-915C-3CB68BADF41A@me.com> References: <202010111040.09BAeCfg073782@repo.freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org In-Reply-To: <202010111040.09BAeCfg073782@repo.freebsd.org> To: Alexey Dokuchaev X-Mailer: iPhone Mail (18A393) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-10-11_06:2020-10-09, 2020-10-11 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-2006250000 definitions=main-2010110117 X-Rspamd-Queue-Id: 4C8Lhq4lLHz48Qm X-Spamd-Bar: ++++++ X-Spamd-Result: default: False [6.65 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GREYLIST(0.00)[pass,body]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(0.00)[+ip4:17.58.0.0/16:c]; FREEMAIL_FROM(0.00)[me.com]; MV_CASE(0.50)[]; DKIM_TRACE(0.00)[me.com:+]; DMARC_POLICY_ALLOW(0.00)[me.com,quarantine]; NEURAL_HAM_SHORT(-0.28)[-0.283]; RCVD_IN_DNSWL_LOW(-0.10)[17.58.63.176:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[me.com]; ASN(0.00)[asn:714, ipnet:17.58.63.0/24, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[me.com:dkim]; ARC_NA(0.00)[]; RECEIVED_SPAMHAUS_XBL(5.00)[46.131.37.251:received]; R_DKIM_ALLOW(0.00)[me.com:s=1a1hai]; FREEFALL_USER(0.00)[tsoome]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_MEDIUM(0.69)[0.687]; BAD_REP_POLICIES(0.10)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_LONG(0.84)[0.843]; RWL_MAILSPIKE_POSSIBLE(0.00)[17.58.63.176:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-head] X-Spam: Yes X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Oct 2020 12:29:16 -0000 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.loca= l), but the implementation specific file, part of special feature. That is, o= ne should not assume the presence of nextboot.conf file, make assumptions ab= out its content, or perform manual edits on it. Rgds, Toomas > On 11. Oct 2020, at 13:40, Alexey Dokuchaev wrote: >=20 > =EF=BB=BFAuthor: danfe (ports committer) > Date: Sun Oct 11 10:40:11 2020 > New Revision: 366626 > URL: https://svnweb.freebsd.org/changeset/base/366626 >=20 > Log: > The nextboot(8) manual page currently says that the loader(8) would delet= e > the /boot/nextboot.conf file or its contents which is 1) not the most use= r- > friendly way of working with custom configurations, and 2) simply not tru= e > for both Forth and Lua implementations: they would not delete it, but jus= t > change the setting to "NO", that is, disable it. >=20 > While at it, add one missing serial (Oxford) comma and fix some bogus lin= e > wraps along the way. >=20 > Approved by: bcr (manpages) > Differential Revision: https://reviews.freebsd.org/D25971 >=20 > Modified: > head/sbin/reboot/nextboot.8 >=20 > Modified: head/sbin/reboot/nextboot.8 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- 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 f= lags > -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 previou= s > +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: