Allow search domains and name servers to be appended.
authorRoy Marples <roy@marples.name>
Fri, 29 Oct 2010 18:48:10 +0000 (18:48 +0000)
committerRoy Marples <roy@marples.name>
Fri, 29 Oct 2010 18:48:10 +0000 (18:48 +0000)
libc.in
resolvconf.conf.5.in

diff --git a/libc.in b/libc.in
index 4ed75a2eaebe2d313136c3a3e016e0da8f7d86d1..0cc561d76fc0c20387db8f74f682c02d3435aa65 100644 (file)
--- a/libc.in
+++ b/libc.in
@@ -112,8 +112,8 @@ case "${resolv_conf_passthrough:-NO}" in
        ;;
 *)
        [ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
-       newsearch="$(uniqify $search_domains $SEARCH)"
-       newns="$(uniqify $name_servers $NAMESERVERS)"
+       newsearch="$(uniqify $search_domains $SEARCH $search_domains_append)"
+       newns="$(uniqify $name_servers $NAMESERVERS $name_servers_append)"
 
        # Hold our new resolv.conf in a variable to save on temporary files
        newconf="# Generated by resolvconf\n"
index 0682ca0535d8cd2154a078fabf315d3a6714a5b6..9a47a1caed6f372d15e6acc3bcf208534304f50e 100644 (file)
@@ -58,10 +58,14 @@ 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 search_domains
 Prepend search domains to the dynamically generated list.
+.It Sy search_domains_append
+Append search domains to the dynamically generated list.
 .It Sy name_servers
 Prepend name servers to the dynamically generated list.
 You should set this to 127.0.0.1 if you use a local name server other than
 libc.
+.It Sy name_servers_append
+Append name servers to the dynamically generated list.
 .It Sy private_interfaces
 These interfaces name servers will only be queried for the domains listed
 in their resolv.conf.