Move more user-unmutable files to the base set, as well as all the

directories.  sysctl.conf moves this time also.

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index b2bead7..5f95d09 100644 (file)
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -46,6 +46,7 @@
 ./dev/MAKEDEV
 ./etc
 ./etc/amd
+./etc/authpf
 ./etc/disklabels
 ./etc/disktab
 ./etc/examples
@@ -78,14 +79,20 @@
 ./etc/examples/sasyncd.conf
 ./etc/examples/sensorsd.conf
 ./etc/examples/snmpd.conf
+./etc/examples/sysctl.conf
 ./etc/examples/ypldap.conf
 ./etc/firmware
+./etc/hotplug
 ./etc/iked
 ./etc/iked/ca
 ./etc/iked/certs
 ./etc/iked/crls
 ./etc/iked/private
 ./etc/iked/pubkeys
+./etc/iked/pubkeys/fqdn
+./etc/iked/pubkeys/ipv4
+./etc/iked/pubkeys/ipv6
+./etc/iked/pubkeys/ufqdn
 ./etc/isakmpd
 ./etc/isakmpd/ca
 ./etc/isakmpd/certs
@@ -104,6 +111,7 @@
 ./etc/ldap/nis.schema
 ./etc/magic
 ./etc/mail
+./etc/mail/README
 ./etc/moduli
 ./etc/mtree
 ./etc/mtree/4.4BSD.dist
@@ -113,7 +121,10 @@
 ./etc/netstart
 ./etc/networks
 ./etc/nginx
+./etc/nginx/koi-utf
+./etc/nginx/koi-win
 ./etc/nginx/mime.types
+./etc/nginx/win-utf
 ./etc/npppd
 ./etc/pf.os
 ./etc/ppp
@@ -3328,6 +3339,7 @@
 ./usr/share/snmp/mibs/OPENBSD-PF-MIB.txt
 ./usr/share/snmp/mibs/OPENBSD-SENSORS-MIB.txt
 ./usr/share/snmp/mibs/OPENBSD-SNMPD-CONF.txt
+./usr/share/sysmerge
 ./usr/share/tabset
 ./usr/share/tabset/std
 ./usr/share/tabset/stdcrt

diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index ab24e02..1ca39c2 100644 (file)
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -1,7 +1,6 @@
 ./.cshrc
 ./.profile
 ./etc/amd/master.sample
-./etc/authpf
 ./etc/changelist
 ./etc/csh.cshrc
 ./etc/csh.login
@@ -14,11 +13,6 @@
 ./etc/gettytab
 ./etc/group
 ./etc/hosts
-./etc/hotplug
-./etc/iked/pubkeys/fqdn
-./etc/iked/pubkeys/ipv4
-./etc/iked/pubkeys/ipv6
-./etc/iked/pubkeys/ufqdn
 ./etc/ksh.kshrc
 ./etc/localtime
 ./etc/locate.rc
@@ -26,7 +20,6 @@
 ./etc/lynx.cfg
 ./etc/mail.rc
 ./etc/mail/Makefile
-./etc/mail/README
 ./etc/mail/access
 ./etc/mail/access.db
 ./etc/mail/aliases
@@ -55,12 +48,9 @@
 ./etc/myname
 ./etc/newsyslog.conf
 ./etc/nginx/fastcgi_params
-./etc/nginx/koi-utf
-./etc/nginx/koi-win
 ./etc/nginx/nginx.conf
 ./etc/nginx/scgi_params
 ./etc/nginx/uwsgi_params
-./etc/nginx/win-utf
 ./etc/npppd/npppd-users
 ./etc/npppd/npppd.conf
 ./etc/passwd
@@ -86,7 +76,6 @@
 ./etc/ssl/openssl.cnf
 ./etc/ssl/x509v3.cnf
 ./etc/sudoers
-./etc/sysctl.conf
 ./etc/syslog.conf
 ./etc/systrace/usr_sbin_lpd
 ./etc/systrace/usr_sbin_named