Import openresolv 3.8.1

Obtained from:	http://roy.marples.name/projects/openresolv
This commit is contained in:
Pedro F. Giffuni 2016-07-19 23:22:06 +00:00
parent e4bff59612
commit 2a4f382499
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/vendor/openresolv/dist/; revision=303048
svn path=/vendor/openresolv/3.8.1/; revision=303049; tag=vendor/openresolv/3.8.1
3 changed files with 19 additions and 16 deletions

View File

@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.Dd February 23, 2016 .Dd May 7, 2016
.Dt RESOLVCONF 8 .Dt RESOLVCONF 8
.Os .Os
.Sh NAME .Sh NAME
@ -64,7 +64,7 @@ solves this by letting the daemon send their
file to file to
.Nm .Nm
via via
.Xr stdin 3 .Xr stdin 4
with the argument with the argument
.Fl a Ar interface Ns Op Ar .protocol .Fl a Ar interface Ns Op Ar .protocol
instead of the filesystem. instead of the filesystem.
@ -101,7 +101,7 @@ as private.
This means that the name servers listed in that This means that the name servers listed in that
.Pa resolv.conf .Pa resolv.conf
are only used for queries against the domain/search listed in the same file. are only used for queries against the domain/search listed in the same file.
This only works when a local resolver other than libc is installed. This only works when a local resolver other than libc is installed.
See See
.Xr resolvconf.conf 5 .Xr resolvconf.conf 5
for how to configure for how to configure
@ -290,16 +290,16 @@ Directory of subscribers which are run after the libc subscriber is run.
State directory for State directory for
.Nm . .Nm .
.El .El
.Sh SEE ALSO
.Xr resolver 3 ,
.Xr stdin 4 ,
.Xr resolv.conf 5 ,
.Xr resolvconf.conf 5
.Sh HISTORY .Sh HISTORY
This implementation of This implementation of
.Nm .Nm
is called openresolv and is fully command line compatible with Debian's is called openresolv and is fully command line compatible with Debian's
resolvconf, as written by Thomas Hood. resolvconf, as written by Thomas Hood.
.Sh SEE ALSO
.Xr resolv.conf 5 ,
.Xr resolvconf.conf 5 ,
.Xr resolver 3 ,
.Xr stdin 3
.Sh AUTHORS .Sh AUTHORS
.An Roy Marples Aq Mt roy@marples.name .An Roy Marples Aq Mt roy@marples.name
.Sh BUGS .Sh BUGS

View File

@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.Dd February 23, 2016 .Dd April 28, 2016
.Dt RESOLVCONF.CONF 5 .Dt RESOLVCONF.CONF 5
.Os .Os
.Sh NAME .Sh NAME
@ -103,7 +103,8 @@ This is equivalent to the
.Nm resolvconf -p .Nm resolvconf -p
option. option.
.It Sy replace .It Sy replace
Is a space separated list of replacement keywords. The syntax is this: Is a space separated list of replacement keywords.
The syntax is this:
.Va $keyword Ns / Ns Va $match Ns / Ns Va $replacement .Va $keyword Ns / Ns Va $match Ns / Ns Va $replacement
.Pp .Pp
Example, given this resolv.conf: Example, given this resolv.conf:
@ -307,10 +308,9 @@ Command to restart the unbound service.
Location of the unbound pidfile. Location of the unbound pidfile.
.El .El
.Sh SEE ALSO .Sh SEE ALSO
.Xr sh 1 ,
.Xr resolv.conf 5 , .Xr resolv.conf 5 ,
.Xr resolvconf 8 .Xr resolvconf 8
and
.Xr sh 1 .
.Sh AUTHORS .Sh AUTHORS
.An Roy Marples Aq Mt roy@marples.name .An Roy Marples Aq Mt roy@marples.name
.Sh BUGS .Sh BUGS

View File

@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
RESOLVCONF="$0" RESOLVCONF="$0"
OPENRESOLV_VERSION="3.8.0" OPENRESOLV_VERSION="3.8.1"
SYSCONFDIR=@SYSCONFDIR@ SYSCONFDIR=@SYSCONFDIR@
LIBEXECDIR=@LIBEXECDIR@ LIBEXECDIR=@LIBEXECDIR@
VARDIR=@VARDIR@ VARDIR=@VARDIR@
@ -152,7 +152,10 @@ parse_resolv()
private=false private=false
for p in $private_interfaces; do for p in $private_interfaces; do
case "$iface" in case "$iface" in
"$p"|"$p":*) private=true; break;; "$p"|"$p":*)
private=true
break
;;
esac esac
done done
fi fi
@ -270,11 +273,11 @@ detect_init()
local status="@STATUSARG@" local status="@STATUSARG@"
: ${status:=status} : ${status:=status}
if [ -x /bin/systemctl -a -S /run/systemd/private ]; then if [ -x /bin/systemctl -a -S /run/systemd/private ]; then
RESTARTCMD="if /bin/systemctl --quiet is-active; then RESTARTCMD="if /bin/systemctl --quiet is-active \$1.service; then
/bin/systemctl restart \$1.service; /bin/systemctl restart \$1.service;
fi" fi"
elif [ -x /usr/bin/systemctl -a -S /run/systemd/private ]; then elif [ -x /usr/bin/systemctl -a -S /run/systemd/private ]; then
RESTARTCMD="if /usr/bin/systemctl --quiet is-active; then RESTARTCMD="if /usr/bin/systemctl --quiet is-active \$1.service; then
/usr/bin/systemctl restart \$1.service; /usr/bin/systemctl restart \$1.service;
fi" fi"
elif [ -x /sbin/rc-service -a \ elif [ -x /sbin/rc-service -a \