summaryrefslogtreecommitdiffstats
path: root/recipes-containers/lxc/files/lxc-0.9.0-check-when-bind-mounting-libdirs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-containers/lxc/files/lxc-0.9.0-check-when-bind-mounting-libdirs.patch')
-rw-r--r--recipes-containers/lxc/files/lxc-0.9.0-check-when-bind-mounting-libdirs.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/recipes-containers/lxc/files/lxc-0.9.0-check-when-bind-mounting-libdirs.patch b/recipes-containers/lxc/files/lxc-0.9.0-check-when-bind-mounting-libdirs.patch
deleted file mode 100644
index 4d21a02d..00000000
--- a/recipes-containers/lxc/files/lxc-0.9.0-check-when-bind-mounting-libdirs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 9e74f8161b8db05365fde0646b0c29c852afc3a0 Mon Sep 17 00:00:00 2001
2From: Bogdan Purcareata <bogdan.purcareata@freescale.com>
3Date: Tue, 14 May 2013 11:54:23 +0300
4Subject: [PATCH] lxc-busybox: check when bind-mounting host libdirs
5
6The patch changes the busybox template behavior to automatically
7mount /lib and /usr/lib. In case one of these folders does not exist,
8starting the container will fail. Also, if there are other lib entries
9on the host - e.g. /usr/lib64 - mount them as well.
10
11Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com>
12---
13 templates/lxc-busybox.in | 8 +-------
14 1 file changed, 1 insertion(+), 7 deletions(-)
15
16diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
17index cb425ec..49effae 100644
18--- a/templates/lxc-busybox.in
19+++ b/templates/lxc-busybox.in
20@@ -240,13 +240,6 @@ lxc.pts = 1
21 #lxc.aa_profile = unconfined
22 EOF
23
24-if [ -d "$rootfs/lib" ]; then
25-cat <<EOF >> $path/config
26-lxc.mount.entry = /lib $rootfs/lib none ro,bind 0 0
27-lxc.mount.entry = /usr/lib $rootfs/usr/lib none ro,bind 0 0
28-EOF
29-fi
30-
31 libdirs="\
32 lib \
33 usr/lib \
34@@ -255,6 +248,7 @@ fi
35
36 for dir in $libdirs; do
37 if [ -d "/$dir" ] && [ -d "$rootfs/$dir" ]; then
38+ echo "lxc.mount.entry = /$dir $rootfs/$dir none ro,bind 0 0" >> $path/config
39 echo "lxc.mount.entry = /$dir $dir none ro,bind 0 0" >> $path/config
40 fi
41 done
42--
431.7.11.7
44