summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Yoder <stuart.yoder@freescale.com>2012-10-10 03:28:27 +0000
committerMatthew McClintock <msm@freescale.com>2012-11-13 11:17:50 -0600
commit73711f8d36965e366c1e986eb826a60a8041733c (patch)
treedaa9722d97efb474de0d95fe2e4d4e77ac126f6a
parentdfb34ae6440654bb52c4afe1fbaabda6fb499cc1 (diff)
downloadmeta-fsl-ppc-73711f8d36965e366c1e986eb826a60a8041733c.tar.gz
lxc: remove dhcp from busybox template
-the dhcp which is started by default in a container causes our default examples various issues..including vlans not working right, and screwing up host network interfaces if networking isn't virtualized -we do not know yet what the right upstream fix is for this with more testing and characterization needed Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
-rw-r--r--recipes-tools/lxc/busybox_remove_dhcp.patch12
-rw-r--r--recipes-tools/lxc/lxc_0.8.0-rc1.bb3
2 files changed, 14 insertions, 1 deletions
diff --git a/recipes-tools/lxc/busybox_remove_dhcp.patch b/recipes-tools/lxc/busybox_remove_dhcp.patch
new file mode 100644
index 0000000..d28fda8
--- /dev/null
+++ b/recipes-tools/lxc/busybox_remove_dhcp.patch
@@ -0,0 +1,12 @@
1diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
2index a94eaa3..29b87ce 100644
3--- a/templates/lxc-busybox.in
4+++ b/templates/lxc-busybox.in
5@@ -80,7 +80,6 @@ EOF
6 #!/bin/sh
7 /bin/syslogd
8 /bin/mount -a
9-/bin/udhcpc
10 EOF
11
12 # executable
diff --git a/recipes-tools/lxc/lxc_0.8.0-rc1.bb b/recipes-tools/lxc/lxc_0.8.0-rc1.bb
index 51a34f4..e6ed2d6 100644
--- a/recipes-tools/lxc/lxc_0.8.0-rc1.bb
+++ b/recipes-tools/lxc/lxc_0.8.0-rc1.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" 4LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
5PRIORITY = "optional" 5PRIORITY = "optional"
6PR = "r1" 6PR = "r2"
7DEPENDS = "libxml2 libcap" 7DEPENDS = "libxml2 libcap"
8RDEPENDS_${PN} = " \ 8RDEPENDS_${PN} = " \
9 rsync \ 9 rsync \
@@ -22,6 +22,7 @@ RDEPENDS_${PN} = " \
22SRC_URI = "http://lxc.sourceforge.net/download/lxc/${PN}-${PV}.tar.gz \ 22SRC_URI = "http://lxc.sourceforge.net/download/lxc/${PN}-${PV}.tar.gz \
23 file://noldconfig.patch \ 23 file://noldconfig.patch \
24 file://libmounts.patch \ 24 file://libmounts.patch \
25 file://busybox_remove_dhcp.patch \
25 " 26 "
26 27
27SRC_URI[md5sum] ="06ceecf4dbe1be988fc903ad8dd34d29" 28SRC_URI[md5sum] ="06ceecf4dbe1be988fc903ad8dd34d29"