Merge pull request #2213 from hallyn/2018-03-13/revert-cg

Revert "cgroups: don't escape if we're not real root"

Merge pull request #2213 from hallyn/2018-03-13/revert-cg
93936fbc · Christian Brauner · GitHub · f4328733 · 53386adb · 93936fbc
Unverified Commit 93936fbc authored Mar 13, 2018 by Christian Brauner Committed by GitHub Mar 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cgfsng.c src/lxc/cgroups/cgfsng.c +1 -1

No files found.
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1368,7 +1368,7 @@ static char *cg_unified_get_current_cgroup(void)
 	bool will_escape;
 	char *copy = NULL;

-	will_escape = !am_host_unpriv();
+	will_escape = (geteuid() == 0);
 	if (will_escape)
 		basecginfo = read_file("/proc/1/cgroup");
 	else