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

Commit 7aa9524a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I5b985fb4,Ic3acc857 into main 

* changes:
  libprocessgroup: memcg default version 1 -> 2
  libprocessgroup: Explicit field presence for MaxActivationDepth
parents 062fea20 5fa48a84

libprocessgroup/profiles/cgroups.json

+7 −8
Original line number Original line Diff line number Diff line
@@ -20,14 +20,6 @@ 
      "Mode": "0755",

      "Mode": "0755",

      "UID": "system",

      "UID": "system",

      "GID": "system"

      "GID": "system"

    },

    {

      "Controller": "memory",

      "Path": "/dev/memcg",

      "Mode": "0700",

      "UID": "root",

      "GID": "system",

      "Optional": true

    }

    }

  ],

  ],

  "Cgroups2": {

  "Cgroups2": {
@@ -39,6 +31,13 @@ 
      {

      {

        "Controller": "freezer",

        "Controller": "freezer",

        "Path": "."

        "Path": "."

      },

      {

        "Controller": "memory",

        "Path": ".",

        "NeedsActivation": true,

        "MaxActivationDepth": 0,

        "Optional": true

      }

      }

    ]

    ]

  }

  }

libprocessgroup/profiles/cgroups.proto

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ message Cgroup { 
// https://developers.google.com/protocol-buffers/docs/proto3#default

// https://developers.google.com/protocol-buffers/docs/proto3#default

    bool needs_activation = 6 [json_name = "NeedsActivation"];

    bool needs_activation = 6 [json_name = "NeedsActivation"];

    bool is_optional = 7 [json_name = "Optional"];

    bool is_optional = 7 [json_name = "Optional"];

    uint32 max_activation_depth = 8 [json_name = "MaxActivationDepth"];

    optional uint32 max_activation_depth = 8 [json_name = "MaxActivationDepth"];

}

}





// Next: 6

// Next: 6