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>

diff --git a/meta-fsl-ppc/recipes-tools/lxc/busybox_remove_dhcp.patch b/meta-fsl-ppc/recipes-tools/lxc/busybox_remove_dhcp.patch
new file mode 100644 (file)
index 0000000..d28fda8
--- /dev/null
+++ b/meta-fsl-ppc/recipes-tools/lxc/busybox_remove_dhcp.patch
@@ -0,0 +1,12 @@
+diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
+index a94eaa3..29b87ce 100644
+--- a/templates/lxc-busybox.in
++++ b/templates/lxc-busybox.in
+@@ -80,7 +80,6 @@ EOF
+ #!/bin/sh
+ /bin/syslogd
+ /bin/mount -a
+-/bin/udhcpc
+ EOF
+ 
+     # executable

diff --git a/meta-fsl-ppc/recipes-tools/lxc/lxc_0.8.0-rc1.bb b/meta-fsl-ppc/recipes-tools/lxc/lxc_0.8.0-rc1.bb
index 51a34f40a7bfda666df0f98b4990ddbd5c9979c6..e6ed2d6b4019650bb0a7ea925b81eff9f336bc82 100644 (file)
--- a/meta-fsl-ppc/recipes-tools/lxc/lxc_0.8.0-rc1.bb
+++ b/meta-fsl-ppc/recipes-tools/lxc/lxc_0.8.0-rc1.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 PRIORITY = "optional"
-PR = "r1"
+PR = "r2"
 DEPENDS = "libxml2 libcap"
 RDEPENDS_${PN} = " \
                rsync \
@@ -22,6 +22,7 @@ RDEPENDS_${PN} = " \
 SRC_URI = "http://lxc.sourceforge.net/download/lxc/${PN}-${PV}.tar.gz \
        file://noldconfig.patch \
        file://libmounts.patch \
+       file://busybox_remove_dhcp.patch \
        "
 
 SRC_URI[md5sum] ="06ceecf4dbe1be988fc903ad8dd34d29"