|
 |
be3800 |
From 9b40608e772dac4e0fa7b5be3a283360efb282e7 Mon Sep 17 00:00:00 2001
|
|
|
be3800 |
From: Evgeny Vereshchagin <evvers@ya.ru>
|
|
|
be3800 |
Date: Mon, 17 Sep 2018 07:12:38 +0000
|
|
|
be3800 |
Subject: [PATCH] nspawn: chown() the legacy hierarchy when it's used in a
|
|
|
be3800 |
container
|
|
|
be3800 |
|
|
|
be3800 |
This is a follow-up to 720f0a2f3c928cc9379501a52146be9fbb4d9be2.
|
|
|
be3800 |
|
|
|
be3800 |
Closes https://github.com/systemd/systemd/issues/10026
|
|
|
be3800 |
Closes https://github.com/systemd/systemd/issues/9563
|
|
|
be3800 |
|
|
|
be3800 |
(cherry picked from commit 89f180201cd8c0f3ce5cb6e8dd7e2b3cbcf71527)
|
|
|
be3800 |
(cherry picked from commit f4a34d97bd7e1564a51f590df591cb31a1a3f333)
|
|
|
be3800 |
|
|
|
be3800 |
Resolves: #1837423
|
|
|
be3800 |
---
|
|
|
be3800 |
src/nspawn/nspawn-cgroup.c | 2 +-
|
|
|
be3800 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
be3800 |
|
|
|
be3800 |
diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
|
|
|
be3800 |
index d8a39a6959..a231622e29 100644
|
|
|
be3800 |
--- a/src/nspawn/nspawn-cgroup.c
|
|
|
be3800 |
+++ b/src/nspawn/nspawn-cgroup.c
|
|
|
be3800 |
@@ -55,7 +55,7 @@ int chown_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
|
|
|
be3800 |
if (r < 0)
|
|
|
be3800 |
return log_error_errno(r, "Failed to chown() cgroup %s: %m", fs);
|
|
|
be3800 |
|
|
|
be3800 |
- if (unified_requested == CGROUP_UNIFIED_SYSTEMD) {
|
|
|
be3800 |
+ if (unified_requested == CGROUP_UNIFIED_SYSTEMD || (unified_requested == CGROUP_UNIFIED_NONE && cg_unified_controller(SYSTEMD_CGROUP_CONTROLLER) > 0)) {
|
|
|
be3800 |
_cleanup_free_ char *lfs = NULL;
|
|
|
be3800 |
/* Always propagate access rights from unified to legacy controller */
|
|
|
be3800 |
|