diff options
| author | Xu, Yanfei <yanfei.xu@windriver.com> | 2021-11-01 18:13:19 +0800 | 
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-05-19 10:42:21 -0400 | 
| commit | adef68414f3ff580429eff30f15f9d17b34acad8 (patch) | |
| tree | 44e66d6a679418b53679e122d353e61171da24ab /recipes-containers/lxc/files/fix_c_command.patch | |
| parent | 9fd5cea2c77734c9b532275b6971968c48b74e3f (diff) | |
| download | meta-virtualization-adef68414f3ff580429eff30f15f9d17b34acad8.tar.gz | |
lxc: update to 4.0.11
update to 4.0.11
1.drop two patches that have been integrated to upstream repo.
2.drop tests-add-no-validate-when-using-download-template.patch
  because it is no longer appropriate as the "download" has been
  replaced with "busybox"
3.fix the apply failure of templates-use-curl-instead-of-wget.patch
4.update lxc from 4.0.10 to 4.0.11
Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/lxc/files/fix_c_command.patch')
| -rw-r--r-- | recipes-containers/lxc/files/fix_c_command.patch | 36 | 
1 files changed, 0 insertions, 36 deletions
| diff --git a/recipes-containers/lxc/files/fix_c_command.patch b/recipes-containers/lxc/files/fix_c_command.patch deleted file mode 100644 index 1ed8dafd..00000000 --- a/recipes-containers/lxc/files/fix_c_command.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From 9becf309a81806ef08acf9ca99ab95c1bcfa1f65 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Maximilian Blenk <Maximilian.Blenk@bmw.de> | ||
| 3 | Date: Mon, 23 Aug 2021 15:39:28 +0200 | ||
| 4 | Subject: [PATCH] attach: Fix -c command | ||
| 5 | |||
| 6 | Currently, the -c command (to set the selinux context) seems to be | ||
| 7 | broken because the passed context is ignored and always overwritten by | ||
| 8 | the context specified in the config file. The intention behind the -c | ||
| 9 | imho was to be able to manually overwrite this behavior. This patch | ||
| 10 | ensures that the selinux context will be set if passed via the command | ||
| 11 | line. | ||
| 12 | |||
| 13 | Signed-off-by: Maximilian Blenk <Maximilian.Blenk@bmw.de> | ||
| 14 | --- | ||
| 15 | src/lxc/tools/lxc_attach.c | 5 ++++- | ||
| 16 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://github.com/lxc/lxc/commit/9becf309a81806ef08acf9ca99ab95c1bcfa1f65.patch] | ||
| 19 | Comment: No change in any hunk | ||
| 20 | |||
| 21 | diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c | ||
| 22 | index 0374d980b4..e6b388b20c 100644 | ||
| 23 | --- a/src/lxc/tools/lxc_attach.c | ||
| 24 | +++ b/src/lxc/tools/lxc_attach.c | ||
| 25 | @@ -379,7 +379,10 @@ int main(int argc, char *argv[]) | ||
| 26 | attach_options.gid = my_args.gid; | ||
| 27 | |||
| 28 | // selinux_context will be NULL if not set | ||
| 29 | - attach_options.lsm_label = selinux_context; | ||
| 30 | + if (selinux_context) { | ||
| 31 | + attach_options.attach_flags |= LXC_ATTACH_LSM_LABEL; | ||
| 32 | + attach_options.lsm_label = selinux_context; | ||
| 33 | + } | ||
| 34 | |||
| 35 | if (command.program) { | ||
| 36 | ret = c->attach_run_wait(c, &attach_options, command.program, | ||
