Author: jow Date: 2016-01-25 18:47:22 +0100 (Mon, 25 Jan 2016) New Revision: 48495
Modified: trunk/package/network/services/dnsmasq/Makefile trunk/package/network/services/dnsmasq/files/dnsmasq.init Log: dnsmasq: Don't add local hostname if ula prefix is not specified Commit 6a7e56b adds support for adding local hostname for own lan ula adress but if ula prefix is not specified results into an invalid config (address=/OpenWrt.lan/1) causing dnsmasq not to start up. Use lanaddr6 when adding local hostname as the lan ula address is constructed based on the UCI parameters ip6hint and ip6ifaceid and thus not always ula prefix suffixed with 1 Signed-off-by: Hans Dedecker <[email protected]> Modified: trunk/package/network/services/dnsmasq/Makefile =================================================================== --- trunk/package/network/services/dnsmasq/Makefile 2016-01-25 17:42:25 UTC (rev 48494) +++ trunk/package/network/services/dnsmasq/Makefile 2016-01-25 17:47:22 UTC (rev 48495) @@ -9,7 +9,7 @@ PKG_NAME:=dnsmasq PKG_VERSION:=2.75 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq Modified: trunk/package/network/services/dnsmasq/files/dnsmasq.init =================================================================== --- trunk/package/network/services/dnsmasq/files/dnsmasq.init 2016-01-25 17:42:25 UTC (rev 48494) +++ trunk/package/network/services/dnsmasq/files/dnsmasq.init 2016-01-25 17:47:22 UTC (rev 48495) @@ -609,11 +609,11 @@ dhcp_domain_add "" "$hostname" "$lanaddr" } - network_get_ipaddrs6 lanaddr6 "lan" && { + [ -n "$ulaprefix" ] && network_get_ipaddrs6 lanaddr6 "lan" && { for lanaddr6 in $lanaddr6; do case "$lanaddr6" in "${ulaprefix%%:/*}"*) - dhcp_domain_add "" "$hostname" "${ulaprefix%%/*}1" + dhcp_domain_add "" "$hostname" "$lanaddr6" ;; esac done _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
