Date: Sat, 28 Jul 2018 23:43:46 -0600 From: Brad Davis <brd@FreeBSD.org> To: Don Lewis <truckman@FreeBSD.org> Cc: svn-src-head@freebsd.org Subject: Re: r336845 Message-ID: <1532843026.1046379.1456233824.769C9937@webmail.messagingengine.com> In-Reply-To: <tkrat.02109207c5e7255f@FreeBSD.org> References: <tkrat.c0cd2c34873662ea@FreeBSD.org> <1532833805.672495.1456175160.0FD53BA7@webmail.messagingengine.com> <1532834453.674985.1456177136.751B35F0@webmail.messagingengine.com> <tkrat.e6a93bc29b13cbad@FreeBSD.org> <tkrat.437328e26cc26cee@FreeBSD.org> <1532841815.1042814.1456223184.0DDEE8CA@webmail.messagingengine.com> <tkrat.02109207c5e7255f@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Jul 28, 2018, at 11:42 PM, Don Lewis wrote: > On 28 Jul, Brad Davis wrote: > > 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 <src.opts.mk> > >> > > >> > -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 <src.opts.mk> > >> > >> -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. > > Done in r336859. Thank you. Regards, Brad Davis
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1532843026.1046379.1456233824.769C9937>