Use /etc/defaults/rc.conf everywhere, falling back to /etc/rc.conf

as necessary (for half-assed upgrades).

10 files changed, 42 insertions, 26 deletions

diff --git a/etc/netstart b/etc/netstart
index 8b4e975..6a101ba 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: netstart,v 1.51 1997/05/18 20:11:44 jkh Exp $
+#	$Id: netstart,v 1.52 1997/07/05 19:35:45 pst Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # This file is NOT called by any of the other scripts - it has been
@@ -10,7 +10,9 @@
 #
 
 # If there is a global system configuration file, suck it in.
-if [ -f /etc/rc.conf ]; then
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi
 
diff --git a/etc/pccard_ether b/etc/pccard_ether
index 546a54d..1c6081e 100755
--- a/etc/pccard_ether
+++ b/etc/pccard_ether
@@ -1,14 +1,16 @@
 #!/bin/sh -
 #
-#	$Id:$
+#	$Id: pccard_ether,v 1.9 1998/09/02 01:34:56 brian Exp $
 #
 # pccard_ether interfacename [ifconfig option]
 #
 # example: pccard_ether ep0 -link0
 #
 
-# Suck in the /etc/rc.conf variables
-if [ -f /etc/rc.conf ]; then
+# Suck in the configuration variables
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi
 
diff --git a/etc/rc b/etc/rc
index c11a829..a7c877b 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.176 1999/02/09 05:20:46 dillon Exp $
+#	$Id: rc,v 1.177 1999/02/09 17:17:18 dillon Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -34,7 +34,9 @@ fi
 
 # If there is a global system configuration file, suck it in.
 #
-if [ -f /etc/rc.conf ]; then
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi
 
diff --git a/etc/rc.d/diskless b/etc/rc.d/diskless
index ddd52fc..a7f0a50 100644
--- a/etc/rc.d/diskless
+++ b/etc/rc.d/diskless
@@ -3,9 +3,10 @@
 # REQUIRE: initdiskless mountcritlocal
 	if [ -n "$4" ]; then
 		bpi="-i $4"
-
-if [ -f /etc/rc.conf ]; then
-        . /etc/rc.conf
+if [ -f /etc/defaults/rc.conf ]; then
+	/sbin/mdconfig -a -t malloc -s $1 -u $3
+elif [ -f /etc/rc.conf ]; then
+	/sbin/mount /dev/md$3c $2
 }
 
 mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv
index ddd52fc..a7f0a50 100644
--- a/etc/rc.d/resolv
+++ b/etc/rc.d/resolv
@@ -3,9 +3,10 @@
 # REQUIRE: initdiskless mountcritlocal
 	if [ -n "$4" ]; then
 		bpi="-i $4"
-
-if [ -f /etc/rc.conf ]; then
-        . /etc/rc.conf
+if [ -f /etc/defaults/rc.conf ]; then
+	/sbin/mdconfig -a -t malloc -s $1 -u $3
+elif [ -f /etc/rc.conf ]; then
+	/sbin/mount /dev/md$3c $2
 }
 
 mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp
index ddd52fc..a7f0a50 100644
--- a/etc/rc.d/tmp
+++ b/etc/rc.d/tmp
@@ -3,9 +3,10 @@
 # REQUIRE: initdiskless mountcritlocal
 	if [ -n "$4" ]; then
 		bpi="-i $4"
-
-if [ -f /etc/rc.conf ]; then
-        . /etc/rc.conf
+if [ -f /etc/defaults/rc.conf ]; then
+	/sbin/mdconfig -a -t malloc -s $1 -u $3
+elif [ -f /etc/rc.conf ]; then
+	/sbin/mount /dev/md$3c $2
 }
 
 mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
diff --git a/etc/rc.d/var b/etc/rc.d/var
index ddd52fc..a7f0a50 100644
--- a/etc/rc.d/var
+++ b/etc/rc.d/var
@@ -3,9 +3,10 @@
 # REQUIRE: initdiskless mountcritlocal
 	if [ -n "$4" ]; then
 		bpi="-i $4"
-
-if [ -f /etc/rc.conf ]; then
-        . /etc/rc.conf
+if [ -f /etc/defaults/rc.conf ]; then
+	/sbin/mdconfig -a -t malloc -s $1 -u $3
+elif [ -f /etc/rc.conf ]; then
+	/sbin/mount /dev/md$3c $2
 }
 
 mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
diff --git a/etc/rc.devfs b/etc/rc.devfs
index 9c8488e..799445b 100644
--- a/etc/rc.devfs
+++ b/etc/rc.devfs
@@ -1,8 +1,10 @@
 #
-# $Id: rc.devfs,v 1.2 1998/09/20 18:49:04 sos Exp $
+# $Id: rc.devfs,v 1.3 1998/10/13 08:25:09 jkh Exp $
 #
 # If there is a global system configuration file, suck it in.
-if [ -f /etc/rc.conf ]; then
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi
 
diff --git a/etc/rc.diskless2 b/etc/rc.diskless2
index 4b74d29..37412d3 100644
--- a/etc/rc.diskless2
+++ b/etc/rc.diskless2
@@ -3,9 +3,10 @@
 
 # If there is a global system configuration file, suck it in.
 #
-
-if [ -f /etc/rc.conf ]; then
-        . /etc/rc.conf
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
+	. /etc/rc.conf
 fi
 
 mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
diff --git a/etc/rc.firewall b/etc/rc.firewall
index f72b32b..f8feb98 100644
--- a/etc/rc.firewall
+++ b/etc/rc.firewall
@@ -1,8 +1,11 @@
 ############
 # Setup system for firewall service.
-# $Id: rc.firewall,v 1.18 1998/04/18 10:27:05 brian Exp $
+# $Id: rc.firewall,v 1.19 1998/04/25 00:40:55 alex Exp $
 
-if [ -f /etc/rc.conf ]; then
+# Suck in the configuration variables.
+if [ -f /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi