From c29fe5e3d094a8eb7ec6996fcb9a36ae3aaa68d4 Mon Sep 17 00:00:00 2001 From: Bogdan Purcareata Date: Fri, 25 Mar 2016 08:12:53 +0000 Subject: lxc: warning fixes in busybox template Warnings fixes: - optional mounts when dirs not available - busybox dynamically linked - fstab not available in container Signed-off-by: Bogdan Purcareata Signed-off-by: Bruce Ashfield --- ...-Remove-warning-for-dynamically-linked-Bu.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch (limited to 'recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch') diff --git a/recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch b/recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch new file mode 100644 index 00000000..c0a810b1 --- /dev/null +++ b/recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch @@ -0,0 +1,43 @@ +From 07e4c41f2963d73b9aedd552c74f17a33e89f020 Mon Sep 17 00:00:00 2001 +From: Bogdan Purcareata +Date: Thu, 24 Mar 2016 11:54:27 +0000 +Subject: [PATCH] lxc-busybox: Remove warning for dynamically linked Busybox +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The warning has been present since commit 32b37181ea (with no purpose stated). +Support for dynamically linked Busybox has been added since commit bf6cc73696. +Haven't encountered any issues with dynamically linked Busybox in my last +2 years' testing. + +Upstream-status: Accepted +[https://github.com/lxc/lxc/commit/07e4c41f2963d73b9aedd552c74f17a33e89f020] + +Signed-off-by: Bogdan Purcareata +Acked-by: Stéphane Graber +--- + templates/lxc-busybox.in | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in +index f547f9e..336fa12 100644 +--- a/templates/lxc-busybox.in ++++ b/templates/lxc-busybox.in +@@ -304,13 +304,6 @@ configure_busybox() + return 1 + fi + +- file -L $(which busybox) | grep -q "statically linked" +- if [ $? -ne 0 ]; then +- echo "warning : busybox is not statically linked." +- echo "warning : The template script may not correctly" +- echo "warning : setup the container environment." +- fi +- + # copy busybox in the rootfs + cp $(which busybox) $rootfs/bin + if [ $? -ne 0 ]; then +-- +1.9.1 + -- cgit v1.2.3-54-g00ecf