Module Name: src
Committed By: roy
Date: Fri Dec 30 19:43:36 UTC 2016
Modified Files:
src/external/bsd/openresolv/dist: resolvconf.8.in resolvconf.conf.5.in
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/openresolv/dist/resolvconf.8.in
cvs rdiff -u -r1.16 -r1.17 \
src/external/bsd/openresolv/dist/resolvconf.conf.5.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openresolv/dist/resolvconf.8.in
diff -u src/external/bsd/openresolv/dist/resolvconf.8.in:1.8 src/external/bsd/openresolv/dist/resolvconf.8.in:1.9
--- src/external/bsd/openresolv/dist/resolvconf.8.in:1.8 Thu Apr 28 08:16:09 2016
+++ src/external/bsd/openresolv/dist/resolvconf.8.in Fri Dec 30 19:43:36 2016
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd February 23, 2016
+.Dd November 29, 2016
.Dt RESOLVCONF 8
.Os
.Sh NAME
@@ -45,6 +45,8 @@
.Fl il Ar pattern
.Nm
.Fl u
+.Nm
+.Fl Fl version
.Sh DESCRIPTION
.Nm
manages
@@ -106,7 +108,7 @@ See
.Xr resolvconf.conf 5
for how to configure
.Nm
-to use a local name server.
+to use a local name server and how to remove the private marking.
.Pp
.Nm
can mark an interfaces
@@ -126,9 +128,9 @@ on the
.Ar interface .
.Pp
Here are some options for the above commands:-
-.Bl -tag -width indent
+.Bl -tag -width pattern_opt
.It Fl f
-Ignore non existant interfaces.
+Ignore non existent interfaces.
Only really useful for deleting interfaces.
.It Fl m Ar metric
Set the metric of the interface when adding it, default of 0.
@@ -146,7 +148,7 @@ as exclusive when adding, otherwise only
.Pp
.Nm
has some more commands for general usage:-
-.Bl -tag -width indent
+.Bl -tag -width pattern_opt
.It Fl i Ar pattern
List the interfaces and protocols, optionally matching
.Ar pattern ,
@@ -168,12 +170,15 @@ to update all its subscribers.
.Nm
does not update the subscribers when adding a resolv.conf that matches
what it already has for that interface.
+.It Fl Fl version
+Echo the resolvconf version to
+.Em stdout .
.El
.Pp
.Nm
also has some commands designed to be used by it's subscribers and
system startup:-
-.Bl -tag -width indent
+.Bl -tag -width pattern_opt
.It Fl I
Initialise the state directory
.Pa @VARDIR@ .
@@ -223,7 +228,7 @@ Here are some suggested protocol tags to
.Pa resolv.conf
file registered on an
.Ar interface Ns No :-
-.Bl -tag -width indent
+.Bl -tag -width pattern_opt
.It dhcp
Dynamic Host Configuration Protocol.
Initial versions of
Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in
diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.16 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.17
--- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.16 Thu Apr 28 08:17:04 2016
+++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in Fri Dec 30 19:43:36 2016
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd February 23, 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 l
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:
