aboutsummaryrefslogtreecommitdiff
path: root/resolvconf.conf.5.in
diff options
context:
space:
mode:
Diffstat (limited to 'resolvconf.conf.5.in')
-rw-r--r--resolvconf.conf.5.in12
1 files changed, 11 insertions, 1 deletions
diff --git a/resolvconf.conf.5.in b/resolvconf.conf.5.in
index 7b410abbe5e9..fcebd864e367 100644
--- a/resolvconf.conf.5.in
+++ b/resolvconf.conf.5.in
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd April 28, 2016
+.Dd December 29, 2016
.Dt RESOLVCONF.CONF 5
.Os
.Sh NAME
@@ -69,6 +69,11 @@ If unset, defaults to the following:-
These interfaces will be processed next, unless they have a metric.
If unset, defaults to the following:-
.D1 tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*
+.It Sy inclusive_interfaces
+Ignore any exlcusive marking for these interfaces.
+This is handy when 3rd party integrations force the
+.Nm resolvconf -x
+option and you want to disable it easily.
.It Sy local_nameservers
If unset, defaults to the following:-
.D1 127.* 0.0.0.0 255.255.255.255 ::1
@@ -102,6 +107,11 @@ Requires a local nameserver other than libc.
This is equivalent to the
.Nm resolvconf -p
option.
+.It Sy public_interfaces
+Force these interface to be public, overriding the private marking.
+This is handy when 3rd party integrations force the
+.Nm resolvconf -p
+option and you want to disable it easily.
.It Sy replace
Is a space separated list of replacement keywords.
The syntax is this: