diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-07-01 11:32:46 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-07-01 11:32:46 +0000 |
| commit | faab751760e9648a19e26bc8b938ffc06440b4a7 (patch) | |
| tree | 954234f0b4ab4d1c0ca3a2e048511cf13e390521 | |
| parent | c49f8068cdfebe90839400fbadf5e8e97b14fa60 (diff) | |
| download | upstream-faab751760e9648a19e26bc8b938ffc06440b4a7.tar.gz upstream-faab751760e9648a19e26bc8b938ffc06440b4a7.tar.bz2 upstream-faab751760e9648a19e26bc8b938ffc06440b4a7.zip | |
dnsmasq: introduce "add_local_hostname" and "add_local_domain" options - add_local_domain defaults to 1 and controls whether the local domain is written as search directive to the local resolv.conf - add_local_hostname defaults to 1 and controls whether A and PTR records are created automatically for the local hostname These change supersedes http://patchwork.openwrt.org/patch/2207/ and http://patchwork.openwrt.org/patch/2208/
SVN-Revision: 32570
| -rw-r--r-- | package/dnsmasq/files/dnsmasq.init | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index e90d793368..485a2f7b70 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2012 OpenWrt.org START=60 @@ -8,6 +8,9 @@ SERVICE_USE_PID=1 DNS_SERVERS="" DOMAIN="" +ADD_LOCAL_DOMAIN=1 +ADD_LOCAL_HOSTNAME=1 + CONFIGFILE="/var/etc/dnsmasq.conf" xappend() { @@ -111,6 +114,9 @@ dnsmasq() { config_get DOMAIN "$cfg" domain + config_get_bool ADD_LOCAL_DOMAIN "$cfg" add_local_domain 1 + config_get_bool ADD_LOCAL_HOSTNAME "$cfg" add_local_hostname 1 + config_get_bool readethers "$cfg" readethers [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers @@ -490,14 +496,16 @@ start() { echo >> $CONFIGFILE # add own hostname - [ -z "$lanaddr" ] || { + [ $ADD_LOCAL_HOSTNAME -eq 1 ] && [ -n "$lanaddr" ] && { local hostname="$(uci_get system.@system[0].hostname)" dhcp_domain_add "" "${hostname:-OpenWrt}" "$lanaddr" } service_start /usr/sbin/dnsmasq -C $CONFIGFILE && { rm -f /tmp/resolv.conf - [ -n "$DOMAIN" ] && echo "search $DOMAIN" >> /tmp/resolv.conf + [ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && { + echo "search $DOMAIN" >> /tmp/resolv.conf + } DNS_SERVERS="$DNS_SERVERS 127.0.0.1" for DNS_SERVER in $DNS_SERVERS ; do echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf |