From: Bogdan Purcareata <bogdan.purcareata@freescale.com>
Date: Wed, 15 May 2013 09:08:14 +0000 (+0300)
Subject: lxc-busybox: check when bind-mounting host libdirs
X-Git-Tag: lxc-1.0.0.alpha1~1^2~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=794fb287b3bd7a6c07f99ec1565c517922287065;p=thirdparty%2Flxc.git

lxc-busybox: check when bind-mounting host libdirs

The patch removes the behavior of automatically mounting /lib
and /usr/lib, since this is duplicated a few lines below. It will
also remove the risk of failing when one of these entries are not
present on the host - e.g. on a 64bit machine.

Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
index 81e9566c5..db39b0e62 100644
--- a/templates/lxc-busybox.in
+++ b/templates/lxc-busybox.in
@@ -267,13 +267,6 @@ lxc.cap.drop = sys_module mac_admin mac_override sys_time
 #lxc.aa_profile = unconfined
 EOF
 
-if [ -d "$rootfs/lib" ]; then
-cat <<EOF >> $path/config
-lxc.mount.entry = /lib $rootfs/lib none ro,bind 0 0
-lxc.mount.entry = /usr/lib $rootfs/usr/lib none ro,bind 0 0
-EOF
-fi
-
     libdirs="\
         lib \
         usr/lib \