r336845

[Don Lewis]

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 \