Author: blogic Date: 2014-09-01 15:22:05 +0200 (Mon, 01 Sep 2014) New Revision: 42388
Modified: branches/barrier_breaker/package/network/services/dnsmasq/files/dnsmasq.init Log: 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 <[email protected]> Backport of r42318 Modified: branches/barrier_breaker/package/network/services/dnsmasq/files/dnsmasq.init =================================================================== --- branches/barrier_breaker/package/network/services/dnsmasq/files/dnsmasq.init 2014-09-01 13:22:04 UTC (rev 42387) +++ branches/barrier_breaker/package/network/services/dnsmasq/files/dnsmasq.init 2014-09-01 13:22:05 UTC (rev 42388) @@ -441,13 +441,10 @@ [ -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 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
