diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-02-10 18:08:38 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-02-10 18:08:38 +0000 |
| commit | 07240a421cb288ab93e3039f5558421fb19f3621 (patch) | |
| tree | 0b68c734ac0f85419cc88e765b4900717fb21e55 | |
| parent | b8382a40ca6b887960448fc44f8723038a855d39 (diff) | |
Notes
| -rwxr-xr-x | etc/netstart | 6 | ||||
| -rwxr-xr-x | etc/pccard_ether | 8 | ||||
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.devfs | 6 | ||||
| -rw-r--r-- | etc/rc.firewall | 7 |
5 files changed, 22 insertions, 11 deletions
diff --git a/etc/netstart b/etc/netstart index 8b4e97581374..6a101ba33a3a 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 546a54df2137..1c6081ea2bab 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 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.175 1999/01/31 04:28:51 grog Exp $ +# $Id: rc,v 1.169.2.1 1999/01/31 04:35:36 grog Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -36,7 +36,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.devfs b/etc/rc.devfs index 9c8488e0d5a5..799445baafc9 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.firewall b/etc/rc.firewall index f72b32b68144..f8feb9823b7d 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 |