summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Purcareata <bogdan.purcareata@freescale.com>2013-04-11 12:19:51 +0300
committerBruce Ashfield <bruce.ashfield@windriver.com>2013-04-11 13:07:22 -0700
commit6f1446097d819740da9eb3e1376fd718eebb37e9 (patch)
tree5dc3210a6598d3681b88945bc5668afd129ea1bf
parent4c111373fc0b88ce14407e858a749fe3f2eff516 (diff)
downloadmeta-virtualization-6f1446097d819740da9eb3e1376fd718eebb37e9.tar.gz
lxc: Add disable udhcp patch to LXC recipe
The provided patch makes a modification to the LXC busybox template (the template that creates a minimal container with Busybox). This type of container will start the udhcpc service - the DHCP client - on init. For an embedded Linux image, we might assume that the majority of containers will have manual / static networking configuration on start. Considering this, starting the udhcpc service by default is useless, since the service will then has to be killed. The containers that use DHCP for networking can start udhcpc after container boot, or alter the busybox template locally to do so by default. The patch deactivates the default start of the DHCP client on a Busybox container init. Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-containers/lxc/files/lxc-0.9.0-disable-udhcp-from-busybox-template.patch24
-rw-r--r--recipes-containers/lxc/lxc_0.9.0.bb1
2 files changed, 25 insertions, 0 deletions
diff --git a/recipes-containers/lxc/files/lxc-0.9.0-disable-udhcp-from-busybox-template.patch b/recipes-containers/lxc/files/lxc-0.9.0-disable-udhcp-from-busybox-template.patch
new file mode 100644
index 00000000..723be277
--- /dev/null
+++ b/recipes-containers/lxc/files/lxc-0.9.0-disable-udhcp-from-busybox-template.patch
@@ -0,0 +1,24 @@
1From d7e07e7acb1cbad33806f49143a2a30b4468c369 Mon Sep 17 00:00:00 2001
2From: Bogdan Purcareata <bogdan.purcareata@freescale.com>
3Date: Mon, 8 Apr 2013 18:30:19 +0300
4Subject: [PATCH] lxc-0.9.0-disable-udhcp-from-busybox-template
5
6---
7 templates/lxc-busybox.in | 1 -
8 1 file changed, 1 deletion(-)
9
10diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
11index cb425ec..bb8c951 100644
12--- a/templates/lxc-busybox.in
13+++ b/templates/lxc-busybox.in
14@@ -84,7 +84,6 @@ EOF
15 #!/bin/sh
16 /bin/syslogd
17 /bin/mount -a
18-/bin/udhcpc
19 EOF
20
21 # executable
22--
231.7.11.7
24
diff --git a/recipes-containers/lxc/lxc_0.9.0.bb b/recipes-containers/lxc/lxc_0.9.0.bb
index 292285d6..1d6ce71b 100644
--- a/recipes-containers/lxc/lxc_0.9.0.bb
+++ b/recipes-containers/lxc/lxc_0.9.0.bb
@@ -22,6 +22,7 @@ RDEPENDS_${PN} = " \
22" 22"
23 23
24SRC_URI = "http://lxc.sourceforge.net/download/lxc/${PN}-${PV}.tar.gz \ 24SRC_URI = "http://lxc.sourceforge.net/download/lxc/${PN}-${PV}.tar.gz \
25 file://lxc-0.9.0-disable-udhcp-from-busybox-template.patch \
25 " 26 "
26SRC_URI[md5sum] = "8552a4479090616f4bc04d8473765fc9" 27SRC_URI[md5sum] = "8552a4479090616f4bc04d8473765fc9"
27SRC_URI[sha256sum] = "1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120" 28SRC_URI[sha256sum] = "1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120"