From owner-svn-src-head@freebsd.org Sun Jul 29 05:23:36 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 832CC104B535 for ; Sun, 29 Jul 2018 05:23:36 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (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 2142571E24; Sun, 29 Jul 2018 05:23:36 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id A89A821990; Sun, 29 Jul 2018 01:23:35 -0400 (EDT) Received: from web6 ([10.202.2.216]) by compute5.internal (MEProxy); Sun, 29 Jul 2018 01:23:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=gdnnQr V+tD52JuJl5gWT8XH8sRcnR9KiWbGKYvESYmo=; b=lDeh+2L2x3I4NVPWBWSt7v JIx3k95zPGFobfX1cEwZVGxDoNQJkuNu9djjonObbcjeshcZAQD6AI3jzspsuOUh tR4V2tHw8IZt3ghOOqSjg5jjiLJ0NNDDvHubLtraPQNnd5IAA42xQ62Kc7/3b2Dl GItl129YnGXdYhtbm7au+GhV4cu1JYIY+QWOivFvp4plUa9txJyNTImMLqfO0Jio NeJCW15ksU5162/dCeQ8by5/N/+7Ksu4Wxi4GyG7Rvqllb4L0s47rOYPIzqM4N6f iEviAF9kimY0O8JqTMQKmLejvMSDSymI2bL27pLNtOY4ehkgStGWwAjti7pyxIIw == X-ME-Proxy: X-ME-Sender: Received: by mailuser.nyi.internal (Postfix, from userid 99) id 50EDA42DD; Sun, 29 Jul 2018 01:23:35 -0400 (EDT) Message-Id: <1532841815.1042814.1456223184.0DDEE8CA@webmail.messagingengine.com> From: Brad Davis To: Don Lewis Cc: svn-src-head@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" X-Mailer: MessagingEngine.com Webmail Interface - ajax-0843ff3e In-Reply-To: Date: Sat, 28 Jul 2018 23:23:35 -0600 Subject: Re: r336845 References: <1532833805.672495.1456175160.0FD53BA7@webmail.messagingengine.com> <1532834453.674985.1456177136.751B35F0@webmail.messagingengine.com> 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 05:23:36 -0000 On Sat, Jul 28, 2018, at 10:56 PM, Don Lewis wrote: > 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 \ Argh, yeah.. I have moved those around in my tree as prep for another commit that pushes those into other subdirs. Sorry again. Please commit rather than waiting on me and mentor roundtrip. If you haven't committed in the morning US time I will do it. Regards, Brad Davis