Ubuntu
lxc package

Merge lp:~serge-hallyn/ubuntu/trusty/lxc/lxc-dnsmasq-S into lp:~ubuntu-branches/ubuntu/trusty/lxc/trusty

  1. Trusty (14.04)
  2. lxc-dnsmasq-S
  3. Merge into trusty
Proposed by Serge Hallyn
Status: Needs review
Proposed branch: lp:~serge-hallyn/ubuntu/trusty/lxc/lxc-dnsmasq-S
Merge into: lp:~ubuntu-branches/ubuntu/trusty/lxc/trusty
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/lxc.lxc-net.upstart (+1/-1)
To merge this branch: bzr merge lp:~serge-hallyn/ubuntu/trusty/lxc/lxc-dnsmasq-S
Reviewer Review Type Date Requested Status
Stéphane Graber Pending
Review via email: mp+193348@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

308. By Serge Hallyn

debian/lxc.lxc-net.upstart: pass -S $LXCDOMAIN to dnsmasq to prevent
resolv loops. (LP: #1245322)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-29 16:15:27 +0000
3+++ debian/changelog 2013-10-30 23:07:46 +0000
4@@ -1,3 +1,10 @@
5+lxc (1.0.0~alpha2-0ubuntu6) UNRELEASED; urgency=low
6+
7+ * debian/lxc.lxc-net.upstart: pass -S $LXCDOMAIN to dnsmasq to prevent
8+ resolv loops. (LP: #1245322)
9+
10+ -- Serge Hallyn <serge.hallyn@ubuntu.com> Wed, 30 Oct 2013 18:04:44 -0500
11+
12 lxc (1.0.0~alpha2-0ubuntu5) trusty; urgency=low
13
14 [ Serge Hallyn]
15
16=== modified file 'debian/lxc.lxc-net.upstart'
17--- debian/lxc.lxc-net.upstart 2013-08-06 08:03:59 +0000
18+++ debian/lxc.lxc-net.upstart 2013-10-30 23:07:46 +0000
19@@ -44,7 +44,7 @@
20
21 LXC_DOMAIN_ARG=""
22 if [ -n "$LXC_DOMAIN" ]; then
23- LXC_DOMAIN_ARG="-s $LXC_DOMAIN"
24+ LXC_DOMAIN_ARG="-s $LXC_DOMAIN -S /$LXC_DOMAIN/"
25 fi
26 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
27 touch ${varrun}/network_up

Subscribers

People subscribed via source and target branches

to all changes: