From b5b6e95c7bb5f1471157a8c10765993b3d7ee947 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Sun, 1 Oct 2000 05:49:26 +0000
Subject: [PATCH] move default config files from /etc/default -> /etc/defaults,
 to be consistent with what FreeBSD uses /etc/defaults for, and since SVR4
 uses /etc/default for another purpose. as discussed on tech-userlevel, and no
 objections were made.

---
 etc/Makefile              |   4 +-
 etc/daily.conf            |   6 +-
 etc/default/Makefile      |   9 --
 etc/default/daily.conf    |  21 -----
 etc/default/monthly.conf  |   7 --
 etc/default/rc.conf       | 174 --------------------------------------
 etc/default/security.conf |  24 ------
 etc/default/weekly.conf   |   9 --
 etc/monthly.conf          |   6 +-
 etc/mtree/NetBSD.dist     |   8 +-
 etc/rc.conf               |   9 +-
 etc/security.conf         |   6 +-
 etc/weekly.conf           |   6 +-
 13 files changed, 24 insertions(+), 265 deletions(-)
 delete mode 100644 etc/default/Makefile
 delete mode 100644 etc/default/daily.conf
 delete mode 100644 etc/default/monthly.conf
 delete mode 100644 etc/default/rc.conf
 delete mode 100644 etc/default/security.conf
 delete mode 100644 etc/default/weekly.conf

diff --git a/etc/Makefile b/etc/Makefile
index 4a8ab6d168b8..d86834da3ade 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.161 2000/09/11 21:53:30 hubertf Exp $
+#	$NetBSD: Makefile,v 1.162 2000/10/01 05:51:09 lukem Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -167,7 +167,7 @@ distribution: distrib-dirs
 		rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \
 		ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \
 		ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile)
-	(cd default; ${MAKE} install)
+	(cd defaults; ${MAKE} install)
 	(cd mtree; ${MAKE} install)
 	(cd namedb; \
 		${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
diff --git a/etc/daily.conf b/etc/daily.conf
index 468c61ec0957..63d7c4001e7b 100644
--- a/etc/daily.conf
+++ b/etc/daily.conf
@@ -1,9 +1,9 @@
-#	$NetBSD: daily.conf,v 1.3 2000/08/21 23:06:22 lukem Exp $
+#	$NetBSD: daily.conf,v 1.4 2000/10/01 05:53:01 lukem Exp $
 #
 # see daily.conf(5) for more information.
 
-if [ -r /etc/default/daily.conf ]; then
-	. /etc/default/daily.conf
+if [ -r /etc/defaults/daily.conf ]; then
+	. /etc/defaults/daily.conf
 fi
 
 # Add local overrides below
diff --git a/etc/default/Makefile b/etc/default/Makefile
deleted file mode 100644
index d90389241c97..000000000000
--- a/etc/default/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2000/08/21 23:00:26 lukem Exp $
-
-FILES=		daily.conf monthly.conf rc.conf security.conf weekly.conf
-FILESDIR=	/etc/default
-FILESMODE=	${NONBINMODE}
-
-NOPROG= noprog
-
-.include <bsd.prog.mk>
diff --git a/etc/default/daily.conf b/etc/default/daily.conf
deleted file mode 100644
index 6733b67f1660..000000000000
--- a/etc/default/daily.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#	$NetBSD: daily.conf,v 1.2 2000/08/25 01:11:43 hubertf Exp $
-#
-# /etc/default/daily.conf --
-#	default configuration of /etc/daily.conf
-#
-# see daily.conf(5) for more information.
-#
-
-find_core=YES
-expire_news=NO
-purge_accounting=YES
-run_msgs=YES
-run_calendar=YES
-check_uucp=YES
-check_disks=YES
-check_mailq=YES
-check_network=YES
-run_fsck=NO
-run_rdist=YES
-run_security=YES
-run_skeyaudit=YES
diff --git a/etc/default/monthly.conf b/etc/default/monthly.conf
deleted file mode 100644
index ddac497dea33..000000000000
--- a/etc/default/monthly.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: monthly.conf,v 1.1 2000/08/21 23:00:27 lukem Exp $
-#
-# /etc/default/monthly.conf --
-#	default configuration of /etc/monthly.conf
-#
-# see monthly.conf(5) for more information.
-
diff --git a/etc/default/rc.conf b/etc/default/rc.conf
deleted file mode 100644
index dc1d09c20159..000000000000
--- a/etc/default/rc.conf
+++ /dev/null
@@ -1,174 +0,0 @@
-#	$NetBSD: rc.conf,v 1.3 2000/09/21 10:36:02 ad Exp $
-#
-# /etc/default/rc.conf --
-#	default configuration of /etc/rc.conf
-#
-# see rc.conf(5) for more information.
-#
-
-#
-# Use program=YES to enable program, NO to disable it. program_flags are
-# passed to the program on the command line.
-#
-
-# Uncomment this if you want to use local paths in rc.
-#
-#export PATH=$PATH:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin
-
-# If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
-#
-do_rcshutdown=YES
-
-# Basic network configuration
-#
-
-# Fully Qualified Internet Domain Name (a.k.a. hostname, e.g. foo.baz.edu).
-# If blank, use /etc/myname.
-#
-hostname=""
-
-# If there's only one way out of your network, set this to the hostname
-# or the IP address of the router that will get your packets off the LAN.
-# If blank, use /etc/mygate.
-#
-defaultroute=""
-
-# The NIS domain name (formerly known as Yellow Pages); not in any way
-# related to Internet domain names.
-# If blank, use /etc/defaultdomain.
-#
-domainname=""
-
-# Filesystems to mount early in boot-up.
-# Note that `/var' is needed in $critical_filesystems_beforenet (or
-# implied as part of `/') as certain services that need /var (such as
-# dhclient) may be needed to get the network operational enough to mount
-# the $critical_filesystems.
-#
-critical_filesystems_beforenet="/var"
-critical_filesystems="/usr"
-
-# Set this to YES if you have purposefully setup no swap partitions and
-# don't want to be warned about it.
-#
-no_swap=NO
-
-# One-time actions and programs on boot-up.
-#
-lkm=NO						# run /etc/rc.lkm
-savecore=YES		savecore_flags="-z"
-clear_tmp=YES					# clear /tmp after reboot
-update_motd=YES					# updates /etc/motd
-dmesg=YES		dmesg_flags=""		# write /var/run/dmesg.boot
-accounting=NO					# needs /var/account/acct
-newsyslog=NO		newsyslog_flags=""	# trim log files
-
-# NOTE: default coredump name now set in /etc/sysctl.conf
-
-# Security setting.  If $securelevel is non-empty, the system securelevel
-# is set to this value early in the boot sequence.  Otherwise the default
-# action is taken (see init(8)).
-#
-securelevel=""					# securelevel to set to
-
-# To set the IP address of an interface either use
-#  ifconfig_xxN="IP-NO"
-# where xxN is the interface.  If this variable is not set then
-# contents of the file /etc/ifconfig.xxN is used.
-
-# Networking startup.
-#
-ipfilter=NO					# uses /etc/ipf.conf
-ipnat=NO					# uses /etc/ipnat.conf
-ipsec=NO					# uses /etc/ipsec.conf
-ipmon=NO		ipmon_flags="-sn"	# syslog ipfilter messages
-auto_ifconfig=YES				# config all avail. interfaces
-net_interfaces=""				# used only if above is NO
-flushroutes=YES					# flush routes in netstart
-dhclient=NO					# behave as a DHCP client
-dhclient_flags=""				# blank: config all interfaces
-ntpdate=NO  		ntpdate_flags="-b -s"	# May need '-u' thru firewall
-ppp_peers=""					# /etc/ppp/peers to call
-ip6mode=host					# host, autohost or router
-rtsol=NO		rtsol_flags=""		# for ip6mode=autohost only
-
-# Daemons required by servers.  These are not needed for strictly client use.
-#
-
-# inetd is used to start the IP-based services enabled in /etc/inetd.conf
-#
-inetd=YES		inetd_flags="-l"	# -l logs libwrap
-
-# rpcbind (formerly known as 'portmap') is used to look up RPC-based services.
-#
-rpcbind=NO		rpcbind_flags="-l"	# -l logs libwrap
-
-# Commonly used daemons.
-#
-syslogd=YES		syslogd_flags="-s"	# -s "secure" unix domain only
-cron=YES
-named=NO		named_flags=""
-timed=NO		timed_flags=""
-ntpd=NO			ntpd_flags=""
-sendmail=NO		sendmail_flags="-bd -q30m"
-postfix=NO
-lpd=NO			lpd_flags="-s"		# -s "secure" unix domain only
-sshd=NO			sshd_flags=""
-
-# Routing daemons.
-#
-routed=NO		routed_flags="-q"
-gated=NO		gated_flags=""
-mrouted=NO		mrouted_flags=""
-route6d=NO		route6d_flags=""
-rtsold=NO		rtsold_flags=""		# for ip6mode=autohost only
-
-# Daemons used to boot other hosts over a network.
-#
-rarpd=NO		rarpd_flags="-a"
-bootparamd=NO		bootparamd_flags=""
-dhcpd=NO		dhcpd_flags="-q"
-dhcrelay=NO		dhcrelay_flags=""
-rbootd=NO		rbootd_flags=""
-mopd=NO			mopd_flags="-a"
-rtadvd=NO		rtadvd_flags=""
-
-# X11 daemons.
-#
-xfs=NO			xfs_flags=""		# X11 font server
-xdm=NO			xdm_flags=""		# X11 display manager; needs
-						# wscons=YES for local displays.
-
-# YP (NIS) daemons.
-#
-ypbind=NO		ypbind_flags=""
-ypserv=NO		ypserv_flags="-d"
-yppasswdd=NO		yppasswdd_flags=""
-
-# NFS daemons and parameters.
-#
-nfs_client=NO					# enable client daemons
-nfs_server=NO					# enable server daemons
-			mountd_flags=""
-			nfsd_flags="-6tun 4"
-lockd=NO		lockd_flags=""
-statd=NO		statd_flags=""
-amd=NO			amd_flags="-l syslog -x error,noinfo,nostats"
-			amd_dir=/amd			# mount dir
-			amd_master=/etc/amd/master	# master map
-
-# Heimdal Kerberos 5 KDC (with Kerberos IV compatibility)
-kdc=NO			kdc_flags=""
-
-# Other daemons.
-#
-rwhod=NO
-
-# Hardware daemons.
-#
-apmd=NO			apmd_flags=""		# APM power management daemon.
-screenblank=NO		screenblank_flags=""	# wscons and FBIO screenblanker
-
-# Configuration of "wscons" console driver virtual screens.
-#
-wscons=NO		wscons_flags=""		# setup wscons from wscons.conf
diff --git a/etc/default/security.conf b/etc/default/security.conf
deleted file mode 100644
index 5a2c5b33a5a0..000000000000
--- a/etc/default/security.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#	$NetBSD: security.conf,v 1.1 2000/08/21 23:00:27 lukem Exp $
-#
-# /etc/default/security.conf --
-#	default configuration of /etc/security.conf
-#
-# see security.conf(5) for more information.
-
-check_passwd=YES
-check_group=YES
-check_rootdotfiles=YES
-check_ftpusers=YES
-check_aliases=YES
-check_rhosts=YES
-check_homes=YES
-check_varmail=YES
-check_nfs=YES
-check_devices=YES
-check_mtree=YES
-check_disklabels=YES
-check_changelist=YES
-
-run_skeyaudit=YES
-
-max_loginlen=8
diff --git a/etc/default/weekly.conf b/etc/default/weekly.conf
deleted file mode 100644
index 06216df6bb64..000000000000
--- a/etc/default/weekly.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: weekly.conf,v 1.1 2000/08/21 23:00:27 lukem Exp $
-#
-# /etc/default/weekly.conf --
-#	default configuration of /etc/weekly.conf
-#
-# see weekly.conf(5) for more information.
-
-clean_uucp=YES
-rebuild_locatedb=YES
diff --git a/etc/monthly.conf b/etc/monthly.conf
index 3070fb77bdbc..38abe0024ad0 100644
--- a/etc/monthly.conf
+++ b/etc/monthly.conf
@@ -1,9 +1,9 @@
-#	$NetBSD: monthly.conf,v 1.2 2000/08/21 23:06:22 lukem Exp $
+#	$NetBSD: monthly.conf,v 1.3 2000/10/01 05:53:01 lukem Exp $
 #
 # see monthly.conf(5) for more information.
 
-if [ -r /etc/default/monthly.conf ]; then
-	. /etc/default/monthly.conf
+if [ -r /etc/defaults/monthly.conf ]; then
+	. /etc/defaults/monthly.conf
 fi
 
 # Add local overrides below
diff --git a/etc/mtree/NetBSD.dist b/etc/mtree/NetBSD.dist
index 8d414106dcc1..1a8449445d26 100644
--- a/etc/mtree/NetBSD.dist
+++ b/etc/mtree/NetBSD.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist,v 1.116 2000/09/29 00:53:41 simonb Exp $
+#	$NetBSD: NetBSD.dist,v 1.117 2000/10/01 05:49:26 lukem Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -29,9 +29,9 @@ fd
 # ./etc
 etc
 
-# ./etc/default
-default
-# ./etc/default
+# ./etc/defaults
+defaults
+# ./etc/defaults
 ..
 
 # ./etc/disklabels
diff --git a/etc/rc.conf b/etc/rc.conf
index 07ec1dd47892..52e3496d784e 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf,v 1.94 2000/08/21 23:06:23 lukem Exp $
+#	$NetBSD: rc.conf,v 1.95 2000/10/01 05:53:03 lukem Exp $
 #
 # see rc.conf(5) for more information.
 #
@@ -6,8 +6,11 @@
 # passed to the program on the command line.
 #
 
-if [ -r /etc/default/rc.conf ]; then
-	. /etc/default/rc.conf
+# Load the defaults in from /etc/defaults/rc.conf (if it's readable).
+# These can be overriden below.
+#
+if [ -r /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
 fi
 
 # If this is not set to YES, the system will drop into single-user mode.
diff --git a/etc/security.conf b/etc/security.conf
index 2600ef5b752b..b0d36addd74e 100644
--- a/etc/security.conf
+++ b/etc/security.conf
@@ -1,9 +1,9 @@
-#	$NetBSD: security.conf,v 1.7 2000/08/21 23:06:23 lukem Exp $
+#	$NetBSD: security.conf,v 1.8 2000/10/01 05:53:03 lukem Exp $
 #
 # see security.conf(5) for more information.
 
-if [ -r /etc/default/security.conf ]; then
-	. /etc/default/security.conf
+if [ -r /etc/defaults/security.conf ]; then
+	. /etc/defaults/security.conf
 fi
 
 # Add local overrides below
diff --git a/etc/weekly.conf b/etc/weekly.conf
index 9fbedd1e38d7..3bcb9837009f 100644
--- a/etc/weekly.conf
+++ b/etc/weekly.conf
@@ -1,9 +1,9 @@
-#	$NetBSD: weekly.conf,v 1.2 2000/08/21 23:06:22 lukem Exp $
+#	$NetBSD: weekly.conf,v 1.3 2000/10/01 05:53:03 lukem Exp $
 #
 # see weekly.conf(5) for more information.
 
-if [ -r /etc/default/weekly.conf ]; then
-	. /etc/default/weekly.conf
+if [ -r /etc/defaults/weekly.conf ]; then
+	. /etc/defaults/weekly.conf
 fi
 
 # Add local overrides below