From 6f1446097d819740da9eb3e1376fd718eebb37e9 Mon Sep 17 00:00:00 2001 From: Bogdan Purcareata Date: Thu, 11 Apr 2013 12:19:51 +0300 Subject: 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 Signed-off-by: Bruce Ashfield --- ...0.9.0-disable-udhcp-from-busybox-template.patch | 24 ++++++++++++++++++++++ recipes-containers/lxc/lxc_0.9.0.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 recipes-containers/lxc/files/lxc-0.9.0-disable-udhcp-from-busybox-template.patch 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 @@ +From d7e07e7acb1cbad33806f49143a2a30b4468c369 Mon Sep 17 00:00:00 2001 +From: Bogdan Purcareata +Date: Mon, 8 Apr 2013 18:30:19 +0300 +Subject: [PATCH] lxc-0.9.0-disable-udhcp-from-busybox-template + +--- + templates/lxc-busybox.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in +index cb425ec..bb8c951 100644 +--- a/templates/lxc-busybox.in ++++ b/templates/lxc-busybox.in +@@ -84,7 +84,6 @@ EOF + #!/bin/sh + /bin/syslogd + /bin/mount -a +-/bin/udhcpc + EOF + + # executable +-- +1.7.11.7 + 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} = " \ " SRC_URI = "http://lxc.sourceforge.net/download/lxc/${PN}-${PV}.tar.gz \ + file://lxc-0.9.0-disable-udhcp-from-busybox-template.patch \ " SRC_URI[md5sum] = "8552a4479090616f4bc04d8473765fc9" SRC_URI[sha256sum] = "1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120" -- cgit v1.2.3-54-g00ecf