projects / lxc.git / blame
| Commit | Line | Data |
|---|---|---|
| 834bb4d7 WB |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
| 3 | Date: Wed, 2 Jan 2019 14:37:58 +0100 | |
| 4 | Subject: [PATCH] PVE: [Config] Disable lxc.monitor cgroup | |
| 5 | ||
| 6 | When not using relative cgroups this makes lxc unusable | |
| 7 | within systemd service files as the service cgroup becomes | |
| 8 | empty. | |
| 9 | ||
| 10 | Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
| 11 | --- | |
| 12 | src/lxc/start.c | 18 +++++++++--------- | |
| 13 | 1 file changed, 9 insertions(+), 9 deletions(-) | |
| 14 | ||
| 15 | diff --git a/src/lxc/start.c b/src/lxc/start.c | |
| 8a25e884 | 16 | index 1cf792aa2..24f387de6 100644 |
| 834bb4d7 WB |
17 | --- a/src/lxc/start.c |
| 18 | +++ b/src/lxc/start.c | |
| 19 | @@ -1954,15 +1954,15 @@ int __lxc_start(const char *name, struct lxc_handler *handler, | |
| 20 | goto out_fini_nonet; | |
| 21 | } | |
| 22 | ||
| 23 | - if (!cgroup_ops->monitor_create(cgroup_ops, handler)) { | |
| 24 | - ERROR("Failed to create monitor cgroup"); | |
| 25 | - goto out_fini_nonet; | |
| 26 | - } | |
| 27 | - | |
| 28 | - if (!cgroup_ops->monitor_enter(cgroup_ops, handler->monitor_pid)) { | |
| 29 | - ERROR("Failed to enter monitor cgroup"); | |
| 30 | - goto out_fini_nonet; | |
| 31 | - } | |
| 32 | + //if (!cgroup_ops->monitor_create(cgroup_ops, handler)) { | |
| 33 | + // ERROR("Failed to create monitor cgroup"); | |
| 34 | + // goto out_fini_nonet; | |
| 35 | + //} | |
| 36 | + | |
| 37 | + //if (!cgroup_ops->monitor_enter(cgroup_ops, handler->monitor_pid)) { | |
| 38 | + // ERROR("Failed to enter monitor cgroup"); | |
| 39 | + // goto out_fini_nonet; | |
| 40 | + //} | |
| 41 | ||
| 42 | if (geteuid() == 0 && !lxc_list_empty(&conf->id_map)) { | |
| 43 | /* If the backing store is a device, mount it here and now. */ | |
| 44 | -- | |
| 8a25e884 | 45 | 2.20.1 |
| 834bb4d7 | 46 |