summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorSuren Baghdasaryan <surenb@google.com>2019-02-02 16:09:17 -0800
committerSuren Baghdasaryan <surenb@google.com>2019-02-06 21:01:41 +0000
commitc760231891489d845b936b30db4f66af1b6aab0d (patch)
treeede6eb0fd15b4c12d10dec88e9c0ac66ff564649 /rootdir
parentbece53e515db3fd7d8f401c040ca4a4bff7d86c8 (diff)
downloadsystem_core-c760231891489d845b936b30db4f66af1b6aab0d.tar.gz
system_core-c760231891489d845b936b30db4f66af1b6aab0d.tar.bz2
system_core-c760231891489d845b936b30db4f66af1b6aab0d.zip
libprocessgroup: Fix file mode parsing that requires octal values
JSON supports only decimal values and therefore file mode which should use octal values has to be represented as strings. Fix the implicit octal-to-decimal conversion and convert from string to octal in the code. Bug: 111307099 Test: confirmed by verifying correct file permissions Change-Id: I3ef9de0aea259f93bf74efeffca72d37d4740e15 Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/cgroups.json12
1 files changed, 6 insertions, 6 deletions
diff --git a/rootdir/cgroups.json b/rootdir/cgroups.json
index 6eb88c957..aa7195609 100644
--- a/rootdir/cgroups.json
+++ b/rootdir/cgroups.json
@@ -3,40 +3,40 @@
{
"Controller": "cpu",
"Path": "/dev/cpuctl",
- "Mode": 0755,
+ "Mode": "0755",
"UID": "system",
"GID": "system"
},
{
"Controller": "cpuacct",
"Path": "/acct",
- "Mode": 0555
+ "Mode": "0555"
},
{
"Controller": "cpuset",
"Path": "/dev/cpuset",
- "Mode": 0755,
+ "Mode": "0755",
"UID": "system",
"GID": "system"
},
{
"Controller": "memory",
"Path": "/dev/memcg",
- "Mode": 0700,
+ "Mode": "0700",
"UID": "root",
"GID": "system"
},
{
"Controller": "schedtune",
"Path": "/dev/stune",
- "Mode": 0755,
+ "Mode": "0755",
"UID": "system",
"GID": "system"
}
],
"Cgroups2": {
"Path": "/dev/cg2_bpf",
- "Mode": 0600,
+ "Mode": "0600",
"UID": "root",
"GID": "root"
}