summaryrefslogtreecommitdiffstats
path: root/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch
diff options
context:
space:
mode:
authorMingli Yu <Mingli.Yu@windriver.com>2018-10-22 16:12:51 +0800
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-10-22 04:41:50 -0400
commit87526423d572b435002f54c6e9e28e4591c53447 (patch)
treeffed2d291a84427256d6a47677977186bf38ef02 /recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch
parentce8f6fe10682d85f7e26ceb3e8ccbc6e01d2b869 (diff)
downloadmeta-virtualization-87526423d572b435002f54c6e9e28e4591c53447.tar.gz
lxc: Upgrade to 3.0.2
* Refresh patch to avoid fuzz warnings * Update to 3.0.2 as lxc-destroy failed when system boot in nfs rootfs in lxc 3.0.1 as below: # lxc-destroy -n test9 lxc-destroy: test9: utils.c: _recursive_rmdir: 149 Failed to delete /var/lib/lxc/test9 lxc-destroy: test9: lxccontainer.c: container_destroy: 2946 Failed to destroy directory "/var/lib/lxc/test9" for "test9" Destroying test9 failed Update to 3.0.2 to fix the above issue Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch')
-rw-r--r--recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch b/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch
index 1c6022b7..e4bb72a0 100644
--- a/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch
+++ b/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch
@@ -1,7 +1,8 @@
1From 0990db9b9723589606104d42ac2cf865b78e50a1 Mon Sep 17 00:00:00 2001 1From 3a7112a38d2c44b6fa49e0da1dc4765defd88dbb Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com> 2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Thu, 31 May 2018 11:44:44 -0400 3Date: Thu, 31 May 2018 11:44:44 -0400
4Subject: [PATCH] template: make busybox template compatible with 4Subject: [PATCH] template: make busybox template compatible with
5
5 core-image-minimal 6 core-image-minimal
6 7
7The busybox template makes a lot of assumptions about how the busybox 8The busybox template makes a lot of assumptions about how the busybox
@@ -16,12 +17,13 @@ core-image-minimal to be able to demonstrate that it can work as well
16as to have it available for the ptests. 17as to have it available for the ptests.
17 18
18Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> 19Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
20
19--- 21---
20 templates/lxc-busybox.in | 16 +++++++++++++--- 22 templates/lxc-busybox.in | 16 +++++++++++++---
21 1 file changed, 13 insertions(+), 3 deletions(-) 23 1 file changed, 13 insertions(+), 3 deletions(-)
22 24
23diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in 25diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
24index 7d00bf5..5a99103 100644 26index 9637a71..45b386f 100644
25--- a/templates/lxc-busybox.in 27--- a/templates/lxc-busybox.in
26+++ b/templates/lxc-busybox.in 28+++ b/templates/lxc-busybox.in
27@@ -181,6 +181,19 @@ configure_busybox() 29@@ -181,6 +181,19 @@ configure_busybox()
@@ -44,8 +46,8 @@ index 7d00bf5..5a99103 100644
44 # symlink busybox for the commands it supports 46 # symlink busybox for the commands it supports
45 # it would be nice to just use "chroot $rootfs busybox --install -s /bin" 47 # it would be nice to just use "chroot $rootfs busybox --install -s /bin"
46 # but that only works right in a chroot with busybox >= 1.19.0 48 # but that only works right in a chroot with busybox >= 1.19.0
47@@ -191,9 +204,6 @@ configure_busybox() 49@@ -189,9 +202,6 @@ configure_busybox()
48 xargs -n1 ln -s busybox 50 ./busybox --list | grep -v busybox | xargs -n1 ln -s busybox
49 ) 51 )
50 52
51- # relink /sbin/init 53- # relink /sbin/init
@@ -54,6 +56,3 @@ index 7d00bf5..5a99103 100644
54 # /etc/fstab must exist for "mount -a" 56 # /etc/fstab must exist for "mount -a"
55 touch "${rootfs}/etc/fstab" 57 touch "${rootfs}/etc/fstab"
56 58
57--
582.7.4
59