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/rc | |
| 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/rc')
| -rw-r--r-- | etc/rc | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 |
