diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-07-02 18:35:17 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-07-02 18:35:17 -0500 |
| commit | 7aa502721fb5918b709ae7595537705faf38408f (patch) | |
| tree | 30415c6cc6c3459cd83d9760112ca3b2b6c75c2f /etc | |
| parent | 13d9c0c302a9efbf93724bd23c4b86a757e45348 (diff) | |
| parent | d08d8c2ff3af6ce2ba65f9805f1f061373e78a82 (diff) | |
| download | FreeBSD-src-7aa502721fb5918b709ae7595537705faf38408f.zip FreeBSD-src-7aa502721fb5918b709ae7595537705faf38408f.tar.gz | |
Merge remote-tracking branch 'origin/master' into devel-11
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 6 | ||||
| -rwxr-xr-x | etc/netstart | 1 |
2 files changed, 6 insertions, 1 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 diff --git a/etc/netstart b/etc/netstart index e499596..a0c595c 100755 --- a/etc/netstart +++ b/etc/netstart @@ -52,7 +52,6 @@ _start=quietstart /etc/rc.d/ppp ${_start} /etc/rc.d/ipfw ${_start} /etc/rc.d/routing ${_start} -/etc/rc.d/mroute6d ${_start} /etc/rc.d/route6d ${_start} /etc/rc.d/routed ${_start} /etc/rc.d/rtsold ${_start} |
