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.diskless2 | |
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.diskless2')
-rw-r--r-- | etc/rc.diskless2 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/rc.diskless2 b/etc/rc.diskless2 index 4b74d29d8c21..37412d31a910 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 |