aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Lidl <lidl@FreeBSD.org>2016-06-23 19:37:00 +0000
committerKurt Lidl <lidl@FreeBSD.org>2016-06-23 19:37:00 +0000
commitcc4eb1ea1040762c0367e9436599e78e2e7abc39 (patch)
tree537c10d4620f0e3ab5da660825eadde78000620e
parent9de217ce56a8779e8b415f98c1b2a065fe0a177c (diff)
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
Notes
Notes: svn path=/head/; revision=302149
-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 61bffc86ccbd..32e75f67f43b 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