diff options
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.patch | 10 |
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 @@ | |||
1 | From b53169dc4c53f9ef64f8cb06dd9af97182577698 Mon Sep 17 00:00:00 2001 | 1 | From 51d88d9741c30ff4a798698514cac831ae61680b Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Thu, 31 May 2018 15:00:34 -0400 | 3 | Date: Thu, 31 May 2018 15:00:34 -0400 |
4 | Subject: [PATCH] tests: our init is not busybox | 4 | Subject: [PATCH] tests: our init is not busybox |
@@ -9,15 +9,16 @@ really only interested in the fact 'cmp' is being run and not the | |||
9 | result, so simplify by comparing '/sbin/init' to itself. | 9 | result, so simplify by comparing '/sbin/init' to itself. |
10 | 10 | ||
11 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 11 | Signed-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 | ||
16 | diff --git a/src/tests/attach.c b/src/tests/attach.c | 17 | diff --git a/src/tests/attach.c b/src/tests/attach.c |
17 | index 2c77127..1c182d6 100644 | 18 | index 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 | -- | ||
30 | 2.7.4 | ||
31 | |||