Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b900a96 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ib5012456,Idbfb49c2,Ieb953c18 am: 4e0a7f22 am: 9d6a710f 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2020016

Change-Id: I3f7abc58a022759aec696c19c5c4056547e4faf6
parents 02498a86 9d6a710f

libprocessgroup/processgroup.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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) {

libprocessgroup/profiles/cgroups.json

+3 −6
Original line number Diff line number Diff line
@@ -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": "."

      }

    ]

  }