From: Stéphane Graber Date: Wed, 26 Feb 2014 00:15:28 +0000 (-0500) Subject: upstart: Don't forward requests for LXC_DOMAIN X-Git-Tag: lxc-1.0.1~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4672c91a418c13f47ed6b4bf4be5153e9e6ee35e;p=thirdparty%2Flxc.git 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 --- diff --git a/config/init/upstart/lxc-net.conf b/config/init/upstart/lxc-net.conf index 17538bb60..279cd1eeb 100644 --- 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