[src/netbsd-1-5]: src/etc pull up rev 1.95 (approved by thorpej):

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2844ae566200
branches:  netbsd-1-5
changeset: 489636:2844ae566200
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Oct 02 03:29:38 2000 +0000

description:
pull up rev 1.95 (approved by thorpej):
        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.

diffstat:

 etc/rc.conf |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 84c6214f257d -r 2844ae566200 etc/rc.conf
--- a/etc/rc.conf       Mon Oct 02 03:28:51 2000 +0000
+++ b/etc/rc.conf       Mon Oct 02 03:29:38 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: rc.conf,v 1.85.2.7 2000/08/23 12:03:58 lukem Exp $
+#      $NetBSD: rc.conf,v 1.85.2.8 2000/10/02 03:29:38 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.