What we keep under /etc (was: cvs commit: src/etc rc rc.shutdown src/etc/rc.d ...)

[Brian Somers]

On Sat, 9 Oct 2004 01:15:53 +0100, Brian Somers <brian at Awfulhak.org> wrote:
> Is there any good reason that mergemaster deals with this stuff rather than
> make installworld?  Or maybe I should ask, why doesn't make installworld
> handle *some* stuff in /etc, such as /etc/rc.d/ and /etc/defaults/?

Ok, so there doesn't seem to be a huge resistance to this idea.  So how
about we install this stuff as part of installworld:

etc/defaults
etc/mtree
etc/periodic
etc/rc.d

the rationalle being that these are owned by the OS and not by the user.
Mergemaster can stay the same so that it can offer to delete old stuff.

I've worked long and hard on this and attached the hugely complicated
patch to the bottom of this email.

-- 
Brian <brian at Awfulhak.org>                        <brian@[uk.]FreeBSD.org>
      <http://www.Awfulhak.org>                   <brian@[uk.]OpenBSD.org>
Don't _EVER_ lose your sense of humour !

Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.448
diff -u -r1.448 Makefile.inc1
--- Makefile.inc1	27 Sep 2004 08:23:42 -0000	1.448
+++ Makefile.inc1	9 Oct 2004 10:43:30 -0000
@@ -64,6 +64,10 @@
 .endif
 SUBDIR+=sys usr.bin usr.sbin etc
 
+# These directories contain system scripts and configuration files
+# that should not be changed by the user.
+SUBDIR+=etc/defaults etc/mtree etc/periodic etc/rc.d
+
 # These are last, since it is nice to at least get the base system
 # rebuilt before you do them.
 .for _DIR in ${LOCAL_DIRS}