From owner-svn-src-head@freebsd.org Sun Jul 29 04:56:34 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20414104A9CB for ; Sun, 29 Jul 2018 04:56:34 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C01987111A; Sun, 29 Jul 2018 04:56:33 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mousie.catspoiler.org (unknown [76.212.85.177]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: truckman) by smtp.freebsd.org (Postfix) with ESMTPSA id 197E91E3F9; Sun, 29 Jul 2018 04:56:33 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Date: Sat, 28 Jul 2018 21:56:31 -0700 (PDT) From: Don Lewis Subject: Re: r336845 To: Brad Davis cc: svn-src-head@freebsd.org Message-ID: References: <1532833805.672495.1456175160.0FD53BA7@webmail.messagingengine.com> <1532834453.674985.1456177136.751B35F0@webmail.messagingengine.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=us-ascii Content-Disposition: INLINE X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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, 29 Jul 2018 04:56:34 -0000 On 28 Jul, Don Lewis wrote: > On 28 Jul, Brad Davis wrote: >> On Sat, Jul 28, 2018, at 9:10 PM, Brad Davis wrote: >>> On Sat, Jul 28, 2018, at 8:21 PM, Don Lewis wrote: >>> > I just upgraded a machine from r336438 to r336855. When I ran >>> > mergemaster, it asked to delete a bunch of the /etc/rc.d scripts. >>> > Answering yes results in the machine being unbootable. >>> > >>> > I think that the rc.d-related changes in r336845 are the likely culprit. >>> > The following rc.d scripts are some of the missing, and there may be >>> > more: >>> > jail >>> > newsyslog >>> > sshd >>> > sysctl >>> > syslogd >>> > zfs >>> >>> Crap.. Sorry :( >>> >>> I have opened this review to fix it: >>> >>> https://reviews.freebsd.org/D16495 >> >> Committed as r336857. Sorry again Don :( > > Still no joy ... > > *** Beginning comparison > > *** Checking /etc/rc.d for stale files > > *** The following files exist in /etc/rc.d but not in > /var/tmp/temproot/etc/rc.d/: > > jail newsyslog sshd sysctl syslogd zfs > > The presence of stale files in this directory can cause the > dreaded unpredictable results, and therefore it is highly > recommended that you delete them. > > *** Delete them now? [n] > > > It sort of looks like these scripts are getting stashed in the wrong > place under temproot: > > # find /var/tmp/temproot -name zfs > /var/tmp/temproot/etc/zfs > /var/tmp/temproot/etc/zfs/zfs > > # ls -R /var/tmp/temproot/etc/zfs* > /var/tmp/temproot/etc/zfsbe /var/tmp/temproot/etc/zfsd > > /var/tmp/temproot/etc/zfs: > zfs > > # find /var/tmp/temproot -name jail > /var/tmp/temproot/etc/jail > > The patch below helps, but there are still some missing files: > > *** Beginning comparison > > *** Checking /etc/rc.d for stale files > > *** The following files exist in /etc/rc.d but not in > /var/tmp/temproot/etc/rc.d/: > > newsyslog sysctl syslogd > > The presence of stale files in this directory can cause the > dreaded unpredictable results, and therefore it is highly > recommended that you delete them. > > *** Delete them now? [n] n > > > Index: sbin/init/rc.d/Makefile > =================================================================== > --- sbin/init/rc.d/Makefile (revision 336857) > +++ sbin/init/rc.d/Makefile (working copy) > @@ -2,7 +2,7 @@ > > .include > > -CONFSDIR= /etc/rc.d > +CONFDIR= /etc/rc.d > CONFGROUPS= CONFS > > CONFS= DAEMON \ This patch adds back the other missing scripts. They seem to have been deleted from the Makefile by r336845 without being made optional. Index: sbin/init/rc.d/Makefile =================================================================== --- sbin/init/rc.d/Makefile (revision 336857) +++ sbin/init/rc.d/Makefile (working copy) @@ -2,7 +2,7 @@ .include -CONFSDIR= /etc/rc.d +CONFDIR= /etc/rc.d CONFGROUPS= CONFS CONFS= DAEMON \ @@ -75,6 +75,7 @@ netif \ netoptions \ netwait \ + newsyslog \ nfsclient \ nfscbd \ nfsd \ @@ -112,6 +113,8 @@ stf \ swap \ swaplate \ + sysctl \ + syslogd \ tmp \ ${_ubthidhci} \ ugidfw \