summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorlidl <lidl@FreeBSD.org>2016-06-23 19:37:00 +0000
committerlidl <lidl@FreeBSD.org>2016-06-23 19:37:00 +0000
commit5d697e7c812c904333f7baac06c0cddd0ad1263b (patch)
tree537c10d4620f0e3ab5da660825eadde78000620e /etc
parentab637d3a1788cce5e0bf602613954661ed38f99e (diff)
downloadFreeBSD-src-5d697e7c812c904333f7baac06c0cddd0ad1263b.zip
FreeBSD-src-5d697e7c812c904333f7baac06c0cddd0ad1263b.tar.gz
Add support for a /etc/defaults/vendor.conf override file
Reviewed by: stas, imp Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D6895
Diffstat (limited to 'etc')
-rw-r--r--etc/defaults/rc.conf6
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 61bffc8..32e75f6 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -741,3 +741,9 @@ if [ -z "${source_rc_confs_defined}" ]; then
done
}
fi
+
+# Allow vendors to override FreeBSD defaults in /etc/default/rc.conf
+# without the need to carefully manage /etc/rc.conf.
+if [ -r /etc/defaults/vendor.conf ]; then
+ . /etc/defaults/vendor.conf
+fi
OpenPOWER on IntegriCloud