nspawn: chown() the legacy hierarchy when it's used in a container v239-31.2
authorEvgeny Vereshchagin <evvers@ya.ru>
Mon, 17 Sep 2018 07:12:38 +0000 (07:12 +0000)
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>
Fri, 22 May 2020 08:30:35 +0000 (10:30 +0200)
This is a follow-up to 720f0a2f3c928cc9379501a52146be9fbb4d9be2.

Closes https://github.com/systemd/systemd/issues/10026
Closes https://github.com/systemd/systemd/issues/9563

(cherry picked from commit 89f180201cd8c0f3ce5cb6e8dd7e2b3cbcf71527)
(cherry picked from commit f4a34d97bd7e1564a51f590df591cb31a1a3f333)

Resolves: #1837423

src/nspawn/nspawn-cgroup.c

index d8a39a69591ef15ff7e59f3a79ee015a7daba3f8..a231622e2927aad34c0c4ef32f12ad7d8a2be5a4 100644 (file)
@@ -55,7 +55,7 @@ int chown_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
         if (r < 0)
                 return log_error_errno(r, "Failed to chown() cgroup %s: %m", fs);
 
-        if (unified_requested == CGROUP_UNIFIED_SYSTEMD) {
+        if (unified_requested == CGROUP_UNIFIED_SYSTEMD || (unified_requested == CGROUP_UNIFIED_NONE && cg_unified_controller(SYSTEMD_CGROUP_CONTROLLER) > 0)) {
                 _cleanup_free_ char *lfs = NULL;
                 /* Always propagate access rights from unified to legacy controller */