diff options
-rw-r--r-- | recipes-containers/lxc/files/dnsmasq.conf | 2 | ||||
-rw-r--r-- | recipes-containers/lxc/lxc_2.0.8.bb | 6 | ||||
-rw-r--r-- | recipes-extended/libvirt/libvirt/dnsmasq.conf | 2 | ||||
-rw-r--r-- | recipes-extended/libvirt/libvirt_1.3.5.bb | 6 | ||||
-rw-r--r-- | recipes-support/dnsmasq/dnsmasq_2.%.bbappend | 5 |
5 files changed, 16 insertions, 5 deletions
diff --git a/recipes-containers/lxc/files/dnsmasq.conf b/recipes-containers/lxc/files/dnsmasq.conf new file mode 100644 index 00000000..124f7ebe --- /dev/null +++ b/recipes-containers/lxc/files/dnsmasq.conf | |||
@@ -0,0 +1,2 @@ | |||
1 | bind-interfaces | ||
2 | except-interface=lxcbr0 | ||
diff --git a/recipes-containers/lxc/lxc_2.0.8.bb b/recipes-containers/lxc/lxc_2.0.8.bb index c9ce5f06..b616e947 100644 --- a/recipes-containers/lxc/lxc_2.0.8.bb +++ b/recipes-containers/lxc/lxc_2.0.8.bb | |||
@@ -36,6 +36,7 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \ | |||
36 | file://lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch \ | 36 | file://lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch \ |
37 | file://logs-optionally-use-base-filenames-to-report-src-fil.patch \ | 37 | file://logs-optionally-use-base-filenames-to-report-src-fil.patch \ |
38 | file://cgroups-work-around-issue-in-gcc-7.patch \ | 38 | file://cgroups-work-around-issue-in-gcc-7.patch \ |
39 | file://dnsmasq.conf \ | ||
39 | " | 40 | " |
40 | 41 | ||
41 | SRC_URI[md5sum] = "7bfd95280522d7936c0979dfea92cdb5" | 42 | SRC_URI[md5sum] = "7bfd95280522d7936c0979dfea92cdb5" |
@@ -134,6 +135,11 @@ do_install_append() { | |||
134 | if [ -d ${D}${exec_prefix}/lib/python* ]; then mv ${D}${exec_prefix}/lib/python* ${D}${libdir}/; fi | 135 | if [ -d ${D}${exec_prefix}/lib/python* ]; then mv ${D}${exec_prefix}/lib/python* ${D}${libdir}/; fi |
135 | rmdir --ignore-fail-on-non-empty ${D}${exec_prefix}/lib | 136 | rmdir --ignore-fail-on-non-empty ${D}${exec_prefix}/lib |
136 | fi | 137 | fi |
138 | |||
139 | # Force the main dnsmasq instance to bind only to specified interfaces and | ||
140 | # to not bind to virbr0. Libvirt will run its own instance on this interface. | ||
141 | install -d ${D}/${sysconfdir}/dnsmasq.d | ||
142 | install -m 644 ${WORKDIR}/dnsmasq.conf ${D}/${sysconfdir}/dnsmasq.d/lxc | ||
137 | } | 143 | } |
138 | 144 | ||
139 | EXTRA_OEMAKE += "TEST_DIR=${D}${PTEST_PATH}/src/tests" | 145 | EXTRA_OEMAKE += "TEST_DIR=${D}${PTEST_PATH}/src/tests" |
diff --git a/recipes-extended/libvirt/libvirt/dnsmasq.conf b/recipes-extended/libvirt/libvirt/dnsmasq.conf new file mode 100644 index 00000000..a7c30598 --- /dev/null +++ b/recipes-extended/libvirt/libvirt/dnsmasq.conf | |||
@@ -0,0 +1,2 @@ | |||
1 | bind-interfaces | ||
2 | except-interface=virbr0 | ||
diff --git a/recipes-extended/libvirt/libvirt_1.3.5.bb b/recipes-extended/libvirt/libvirt_1.3.5.bb index 8ed2505e..e7a2b235 100644 --- a/recipes-extended/libvirt/libvirt_1.3.5.bb +++ b/recipes-extended/libvirt/libvirt_1.3.5.bb | |||
@@ -27,6 +27,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \ | |||
27 | file://tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch \ | 27 | file://tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch \ |
28 | file://libvirtd.sh \ | 28 | file://libvirtd.sh \ |
29 | file://libvirtd.conf \ | 29 | file://libvirtd.conf \ |
30 | file://dnsmasq.conf \ | ||
30 | file://runptest.patch \ | 31 | file://runptest.patch \ |
31 | file://run-ptest \ | 32 | file://run-ptest \ |
32 | file://tests-allow-separated-src-and-build-dirs.patch \ | 33 | file://tests-allow-separated-src-and-build-dirs.patch \ |
@@ -219,6 +220,7 @@ require libvirt-python.inc | |||
219 | do_install_append() { | 220 | do_install_append() { |
220 | install -d ${D}/etc/init.d | 221 | install -d ${D}/etc/init.d |
221 | install -d ${D}/etc/libvirt | 222 | install -d ${D}/etc/libvirt |
223 | install -d ${D}/etc/dnsmasq.d | ||
222 | 224 | ||
223 | install -m 0755 ${WORKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd | 225 | install -m 0755 ${WORKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd |
224 | install -m 0644 ${WORKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf | 226 | install -m 0644 ${WORKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf |
@@ -266,6 +268,10 @@ do_install_append() { | |||
266 | # Add hook support for libvirt | 268 | # Add hook support for libvirt |
267 | mkdir -p ${D}/etc/libvirt/hooks | 269 | mkdir -p ${D}/etc/libvirt/hooks |
268 | 270 | ||
271 | # Force the main dnsmasq instance to bind only to specified interfaces and | ||
272 | # to not bind to virbr0. Libvirt will run its own instance on this interface. | ||
273 | install -m 644 ${WORKDIR}/dnsmasq.conf ${D}/${sysconfdir}/dnsmasq.d/libvirt-daemon | ||
274 | |||
269 | # remove .la references to our working diretory | 275 | # remove .la references to our working diretory |
270 | for i in `find ${D}${libdir} -type f -name *.la`; do | 276 | for i in `find ${D}${libdir} -type f -name *.la`; do |
271 | sed -i -e 's#-L${B}/src/.libs##g' $i | 277 | sed -i -e 's#-L${B}/src/.libs##g' $i |
diff --git a/recipes-support/dnsmasq/dnsmasq_2.%.bbappend b/recipes-support/dnsmasq/dnsmasq_2.%.bbappend deleted file mode 100644 index 8d66ca6a..00000000 --- a/recipes-support/dnsmasq/dnsmasq_2.%.bbappend +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # dnsmasq is greedy with interfaces by default using bind-dynamic will | ||
2 | # make it less greedy but still function as it did by default. | ||
3 | do_install_append() { | ||
4 | sed -i '/#bind-interfaces/a # Play nice with libvirt\nbind-dynamic' ${D}${sysconfdir}/dnsmasq.conf | ||
5 | } | ||