Merge changes Ib5012456,Idbfb49c2,Ieb953c18

* changes:
  Use uid_t for user IDs and gid_t for group IDs
  Fix cgroup directory permissions
  Simplify cgroups.json
This commit is contained in:
Treehugger Robot 2022-03-16 19:53:41 +00:00 committed by Gerrit Code Review
commit 4e0a7f22fa
2 changed files with 5 additions and 8 deletions

View file

@ -442,8 +442,8 @@ static int createProcessGroupInternal(uid_t uid, int initialPid, std::string cgr
struct stat cgroup_stat;
mode_t cgroup_mode = 0750;
gid_t cgroup_uid = AID_SYSTEM;
uid_t cgroup_gid = AID_SYSTEM;
uid_t cgroup_uid = AID_SYSTEM;
gid_t cgroup_gid = AID_SYSTEM;
int ret = 0;
if (stat(cgroup.c_str(), &cgroup_stat) == 1) {

View file

@ -3,7 +3,7 @@
{
"Controller": "blkio",
"Path": "/dev/blkio",
"Mode": "0755",
"Mode": "0775",
"UID": "system",
"GID": "system"
},
@ -32,16 +32,13 @@
],
"Cgroups2": {
"Path": "/sys/fs/cgroup",
"Mode": "0755",
"Mode": "0775",
"UID": "system",
"GID": "system",
"Controllers": [
{
"Controller": "freezer",
"Path": ".",
"Mode": "0755",
"UID": "system",
"GID": "system"
"Path": "."
}
]
}