diff options
| author | jkh <jkh@FreeBSD.org> | 1999-02-10 18:08:16 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-02-10 18:08:16 +0000 |
| commit | e57466a1c3fb2fd71576a797944c262f7e83c3c4 (patch) | |
| tree | 18c9a1523b7c8c96ba0b06dd49c5664388b0e955 /etc/netstart | |
| parent | fdde373153fe0ee29cd1819aa4d38e1b20bb3565 (diff) | |
| download | FreeBSD-src-e57466a1c3fb2fd71576a797944c262f7e83c3c4.zip FreeBSD-src-e57466a1c3fb2fd71576a797944c262f7e83c3c4.tar.gz | |
Use /etc/defaults/rc.conf everywhere, falling back to /etc/rc.conf
as necessary (for half-assed upgrades).
Diffstat (limited to 'etc/netstart')
| -rwxr-xr-x | etc/netstart | 6 |
1 files changed, 4 insertions, 2 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 |
