Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debian resolvconf script update.

Browse Source
This commit is contained in:
Simon Kelley
2013-09-05 15:36:25 +01:00
parent 0932f9c08b
commit 831b5ba12b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@@ -1,6 +1,7 @@
dnsmasq (2.67-1) unstable; urgency=low dnsmasq (2.67-1) unstable; urgency=low
* New upstream. * New upstream.
* Update resolvconf script. (closes: #720732)
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 4 Aug 2013 14:53:22 +0000 -- Simon Kelley <simon@thekelleys.org.uk> Wed, 4 Aug 2013 14:53:22 +0000

15
debian/resolvconf vendored
View File

@@ -16,8 +16,7 @@ set -e
RUN_DIR="/var/run/dnsmasq" RUN_DIR="/var/run/dnsmasq"
RSLVRLIST_FILE="${RUN_DIR}/resolv.conf" RSLVRLIST_FILE="${RUN_DIR}/resolv.conf"
TMP_FILE="${RSLVRLIST_FILE}_new.$$" TMP_FILE="${RSLVRLIST_FILE}_new.$$"
MY_RECORD_NAME="lo.dnsmasq" MY_NAME_FOR_RESOLVCONF="dnsmasq"
DNSCRYPT_RECORD_NAME="lo.dnscrypt"
[ -x /usr/sbin/dnsmasq ] || exit 0 [ -x /usr/sbin/dnsmasq ] || exit 0
[ -x /lib/resolvconf/list-records ] || exit 1 [ -x /lib/resolvconf/list-records ] || exit 1
@@ -46,14 +45,14 @@ if [ ! -d "$RUN_DIR" ] && ! mkdir --parents --mode=0755 "$RUN_DIR" ; then
fi fi
RSLVCNFFILES="" RSLVCNFFILES=""
for F in $(/lib/resolvconf/list-records --after "$MY_RECORD_NAME") ; do for F in $(/lib/resolvconf/list-records --after "lo.$MY_NAME_FOR_RESOLVCONF") ; do
case "$F" in case "$F" in
"$MY_RECORD_NAME") "lo.$MY_NAME_FOR_RESOLVCONF")
# Omit # Omit own record
;; ;;
"$DNSCRYPT_RECORD_NAME") lo.*)
# Dnscrypt, I only have eyes for you # Include no more records after one for a local nameserver
RSLVCNFFILES="$DNSCRYPT_RECORD_NAME" RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F"
break break
;; ;;
*) *)