Move rc.conf into defaults/ directory. This is part of a larger series

of commits to deal with the rc.conf.site confusion.

1 files changed, 6 insertions, 3 deletions

diff --git a/etc/rc.conf b/etc/defaults/rc.conf
index d1b150b..76256ef 100644
--- a/etc/rc.conf
+++ b/etc/defaults/rc.conf
@@ -2,11 +2,14 @@
 #
 
 # This is rc.conf - a file full of useful variables that you can set 
-# to change the default startup behavior of your system.
+# to change the default startup behavior of your system.  You should
+# not edit this file!  Put any overrides into one of the ${rc_conf_files}
+# instead and you will be able to update these defaults later without
+# spamming your local configuration information.
 #
 # All arguments must be in double or single quotes.
 #
-#	$Id: rc.conf,v 1.82 1999/02/04 00:23:10 grog Exp $
+#	$Id: rc.conf,v 1.83 1999/02/09 04:17:45 dillon Exp $
 
 ##############################################################
 ### Important initial Boot-time options  #####################
@@ -19,7 +22,7 @@ pccard_mem="DEFAULT"	# If pccard_enable=YES, this is card memory address.
 pccard_ifconfig="NO"	# Specialized pccard ethernet configuration (or NO).
 local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d"	# startup script dirs.
 local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic" # periodic script dirs
-rc_conf_files="/etc/rc.conf.site /etc/rc.conf.local"
+rc_conf_files="/etc/rc.conf /etc/rc.conf.local"
 
 ##############################################################
 ###  Network configuration sub-section  ######################