diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-02-10 18:08:16 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-02-10 18:08:16 +0000 |
| commit | 9c63624e6f63e253b29cbfdb129f272dc23f45b2 (patch) | |
| tree | 8b48652bf8aae569608b8695688a0d186a7566be /etc/rc.devfs | |
| parent | eb822b5612748de923b9cd2d172748528eed7e3a (diff) | |
| download | src-9c63624e6f63e253b29cbfdb129f272dc23f45b2.tar.gz src-9c63624e6f63e253b29cbfdb129f272dc23f45b2.zip | |
Use /etc/defaults/rc.conf everywhere, falling back to /etc/rc.conf
as necessary (for half-assed upgrades).
Notes
Notes:
svn path=/head/; revision=43849
Diffstat (limited to 'etc/rc.devfs')
| -rw-r--r-- | etc/rc.devfs | 6 |
1 files changed, 4 insertions, 2 deletions
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 |