projects / lxc.git / blame
| Commit | Line | Data |
|---|---|---|
| bc7e56ac | 1 | From ef58cfcf70fbe666acee0c407f77a22eeb1eec4f Mon Sep 17 00:00:00 2001 |
| 308c8a3e WB |
2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> |
| 3 | Date: Wed, 16 Nov 2016 09:53:42 +0100 | |
| c44ec9ce | 4 | Subject: [PATCH 05/13] start/initutils: make cgroupns separation level |
| 308c8a3e WB |
5 | configurable |
| 6 | ||
| 7 | Adds a new global config variable `lxc.cgroup.separate` | |
| 8 | which controls whether a separation directory for cgroup | |
| 9 | namespaces should be used. | |
| 10 | Can be empty, "privileged", "unprivileged" or "both". | |
| 11 | ||
| 12 | Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
| 13 | --- | |
| 07288e64 | 14 | src/lxc/initutils.c | 17 +++++++++-------- |
| 308c8a3e | 15 | src/lxc/initutils.h | 1 + |
| f39a178a WB |
16 | src/lxc/start.c | 25 ++++++++++++++----------- |
| 17 | 3 files changed, 24 insertions(+), 19 deletions(-) | |
| 308c8a3e WB |
18 | |
| 19 | diff --git a/src/lxc/initutils.c b/src/lxc/initutils.c | |
| f39a178a | 20 | index c190d6d5..97650e67 100644 |
| 308c8a3e WB |
21 | --- a/src/lxc/initutils.c |
| 22 | +++ b/src/lxc/initutils.c | |
| 07288e64 WB |
23 | @@ -88,14 +88,15 @@ static char *copy_global_config_value(char *p) |
| 24 | const char *lxc_global_config_value(const char *option_name) | |
| 25 | { | |
| 26 | static const char * const options[][2] = { | |
| 27 | - { "lxc.bdev.lvm.vg", DEFAULT_VG }, | |
| 28 | - { "lxc.bdev.lvm.thin_pool", DEFAULT_THIN_POOL }, | |
| 29 | - { "lxc.bdev.zfs.root", DEFAULT_ZFSROOT }, | |
| 30 | - { "lxc.bdev.rbd.rbdpool", DEFAULT_RBDPOOL }, | |
| 31 | - { "lxc.lxcpath", NULL }, | |
| 32 | - { "lxc.default_config", NULL }, | |
| 33 | - { "lxc.cgroup.pattern", NULL }, | |
| 34 | - { "lxc.cgroup.use", NULL }, | |
| 35 | + { "lxc.bdev.lvm.vg", DEFAULT_VG }, | |
| 36 | + { "lxc.bdev.lvm.thin_pool", DEFAULT_THIN_POOL }, | |
| 37 | + { "lxc.bdev.zfs.root", DEFAULT_ZFSROOT }, | |
| 38 | + { "lxc.bdev.rbd.rbdpool", DEFAULT_RBDPOOL }, | |
| 39 | + { "lxc.lxcpath", NULL }, | |
| 40 | + { "lxc.default_config", NULL }, | |
| 41 | + { "lxc.cgroup.pattern", NULL }, | |
| 42 | + { "lxc.cgroup.use", NULL }, | |
| 43 | + { "lxc.cgroup.protect_limits", DEFAULT_CGPROTECT }, | |
| 308c8a3e WB |
44 | { NULL, NULL }, |
| 45 | }; | |
| 46 | ||
| 47 | diff --git a/src/lxc/initutils.h b/src/lxc/initutils.h | |
| 7395ab25 | 48 | index c021fd61..443ad026 100644 |
| 308c8a3e WB |
49 | --- a/src/lxc/initutils.h |
| 50 | +++ b/src/lxc/initutils.h | |
| 51 | @@ -43,6 +43,7 @@ | |
| 52 | #define DEFAULT_THIN_POOL "lxc" | |
| 53 | #define DEFAULT_ZFSROOT "lxc" | |
| 54 | #define DEFAULT_RBDPOOL "lxc" | |
| 07288e64 | 55 | +#define DEFAULT_CGPROTECT "privileged" |
| 308c8a3e WB |
56 | |
| 57 | extern void lxc_setup_fs(void); | |
| 58 | extern const char *lxc_global_config_value(const char *option_name); | |
| 59 | diff --git a/src/lxc/start.c b/src/lxc/start.c | |
| bc7e56ac | 60 | index 920f3c23..89e9be96 100644 |
| 308c8a3e WB |
61 | --- a/src/lxc/start.c |
| 62 | +++ b/src/lxc/start.c | |
| bc7e56ac | 63 | @@ -1345,17 +1345,20 @@ static int lxc_spawn(struct lxc_handler *handler) |
| f39a178a | 64 | TRACE("Set up cgroup device limits"); |
| 308c8a3e WB |
65 | |
| 66 | if (cgns_supported()) { | |
| 67 | - if (!cgroup_create(handler, true)) { | |
| 68 | - ERROR("failed to create inner cgroup separation layer"); | |
| 69 | - goto out_delete_net; | |
| 70 | - } | |
| 71 | - if (!cgroup_enter(handler, true)) { | |
| 72 | - ERROR("failed to enter inner cgroup separation layer"); | |
| 73 | - goto out_delete_net; | |
| 74 | - } | |
| 75 | - if (!cgroup_chown(handler, true)) { | |
| 76 | - ERROR("failed chown inner cgroup separation layer"); | |
| 77 | - goto out_delete_net; | |
| 07288e64 | 78 | + const char *tmp = lxc_global_config_value("lxc.cgroup.protect_limits"); |
| f39a178a | 79 | + if (!strcmp(tmp, "both") || !strcmp(tmp, wants_to_map_ids ? "unprivileged" : "privileged")) { |
| 308c8a3e WB |
80 | + if (!cgroup_create(handler, true)) { |
| 81 | + ERROR("failed to create inner cgroup separation layer"); | |
| 82 | + goto out_delete_net; | |
| 83 | + } | |
| 84 | + if (!cgroup_enter(handler, true)) { | |
| 85 | + ERROR("failed to enter inner cgroup separation layer"); | |
| 86 | + goto out_delete_net; | |
| 87 | + } | |
| 88 | + if (!cgroup_chown(handler, true)) { | |
| 89 | + ERROR("failed chown inner cgroup separation layer"); | |
| 90 | + goto out_delete_net; | |
| 91 | + } | |
| 92 | } | |
| 93 | } | |
| 94 | ||
| 95 | -- | |
| 7395ab25 | 96 | 2.11.0 |
| 308c8a3e | 97 |