summaryrefslogtreecommitdiffstats
path: root/recipes-containers/lxc/files/tests-our-init-is-not-busybox.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/tests-our-init-is-not-busybox.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/tests-our-init-is-not-busybox.patch')
-rw-r--r--recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch b/recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch
index 4c9bf652..e6c71d3d 100644
--- a/recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch
+++ b/recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch
@@ -1,4 +1,4 @@
1From b53169dc4c53f9ef64f8cb06dd9af97182577698 Mon Sep 17 00:00:00 2001 1From 51d88d9741c30ff4a798698514cac831ae61680b 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 15:00:34 -0400 3Date: Thu, 31 May 2018 15:00:34 -0400
4Subject: [PATCH] tests: our init is not busybox 4Subject: [PATCH] tests: our init is not busybox
@@ -9,15 +9,16 @@ really only interested in the fact 'cmp' is being run and not the
9result, so simplify by comparing '/sbin/init' to itself. 9result, so simplify by comparing '/sbin/init' to itself.
10 10
11Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> 11Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
12
12--- 13---
13 src/tests/attach.c | 2 +- 14 src/tests/attach.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
15 16
16diff --git a/src/tests/attach.c b/src/tests/attach.c 17diff --git a/src/tests/attach.c b/src/tests/attach.c
17index 2c77127..1c182d6 100644 18index 07e641d..aac609f 100644
18--- a/src/tests/attach.c 19--- a/src/tests/attach.c
19+++ b/src/tests/attach.c 20+++ b/src/tests/attach.c
20@@ -251,7 +251,7 @@ static int test_attach_cmd(struct lxc_container *ct) 21@@ -248,7 +248,7 @@ static int test_attach_cmd(struct lxc_container *ct)
21 { 22 {
22 int ret; 23 int ret;
23 pid_t pid; 24 pid_t pid;
@@ -26,6 +27,3 @@ index 2c77127..1c182d6 100644
26 lxc_attach_command_t command = {"cmp", argv}; 27 lxc_attach_command_t command = {"cmp", argv};
27 lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT; 28 lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT;
28 29
29--
302.7.4
31