upstart: Don't forward requests for LXC_DOMAIN

Without this change, a request to *.LXC_DOMAIN that doesn't get a local result from dnsmasq will be forwarded to its upstream server with the potential of a loop. Thanks to Ed for the patch on Launchpad (LP: #1246094). Reported-by: Ed Swierk Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

upstart: Don't forward requests for LXC_DOMAIN
d4b621a5 · Stéphane Graber · 7e60c3f0 · d4b621a5
Unverified Commit d4b621a5 authored Feb 25, 2014 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lxc-net.conf config/init/upstart/lxc-net.conf +1 -1

No files found.
--- a/config/init/upstart/lxc-net.conf
+++ b/config/init/upstart/lxc-net.conf
@@ -60,7 +60,7 @@ pre-start script

 	LXC_DOMAIN_ARG=""
 	if [ -n "$LXC_DOMAIN" ]; then
-		LXC_DOMAIN_ARG="-s $LXC_DOMAIN"
+		LXC_DOMAIN_ARG="-s $LXC_DOMAIN -S /$LXC_DOMAIN/"
 	fi
 	dnsmasq $LXC_DOMAIN_ARG -u lxc-dnsmasq --strict-order --bind-interfaces --pid-file=${varrun}/dnsmasq.pid --conf-file=${LXC_DHCP_CONFILE} --listen-address ${LXC_ADDR} --dhcp-range ${LXC_DHCP_RANGE} --dhcp-lease-max=${LXC_DHCP_MAX} --dhcp-no-override --except-interface=lo --interface=${LXC_BRIDGE} --dhcp-leasefile=/var/lib/misc/dnsmasq.${LXC_BRIDGE}.leases --dhcp-authoritative || cleanup
 	touch ${varrun}/network_up