aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-08-28 06:27:49 +0000
committerJohn Crispin <john@openwrt.org>2014-08-28 06:27:49 +0000
commit449994b8c21921f8894fe626ecea3ecbe5ffcd16 (patch)
tree9205b3f28971a88bb51f0dfde78a53d79eaaee37 /package/network
parent254b2670e182bc95370c1f41018441170df0d1bc (diff)
downloadupstream-449994b8c21921f8894fe626ecea3ecbe5ffcd16.tar.gz
upstream-449994b8c21921f8894fe626ecea3ecbe5ffcd16.tar.bz2
upstream-449994b8c21921f8894fe626ecea3ecbe5ffcd16.zip
dnsmasq: Create rDNS records for LuCI "Hostnames"
LuCI creates "domain" UCI config sections, which the dnsmasq init file then, currently, translates into "address" config lines. This is not the correct usage of "address" (see r36943), and also causes rDNS records to not be created. This patches dnsmasq.init to utilize the additional hosts file introduced in r40799 for such domain names, resolving both issues. Signed-off-by: Tyler Fenby <tylerf@securecominc.com> SVN-Revision: 42318
Diffstat (limited to 'package/network')
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init9
1 files changed, 3 insertions, 6 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 2ea73af947..c2704e4b9a 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -441,13 +441,10 @@ dhcp_domain_add() {
[ -n "$ip" ] || return 0
for name in $names; do
- [ "${name%.*}" == "$name" ] && \
- name="$name${DOMAIN:+.$DOMAIN}"
-
- record="${record:+$record/}$name"
+ record="${record:+$record }$name"
done
- xappend "--address=/$record/$ip"
+ echo "$ip $record" >> $HOSTFILE
}
dhcp_srv_add() {
@@ -572,7 +569,7 @@ start_service() {
local lanaddr
[ $ADD_LOCAL_HOSTNAME -eq 1 ] && network_get_ipaddr lanaddr "lan" && {
local hostname="$(uci_get system @system[0] hostname OpenWrt)"
- dhcp_hostrecord_add "" "${hostname%.$DOMAIN}${DOMAIN:+.$DOMAIN ${hostname%.$DOMAIN}}" "$lanaddr"
+ dhcp_domain_add "" "$hostname" "$lanaddr"
}
echo >> $CONFIGFILE