summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorThurston Dang <thurston@google.com>2022-01-22 23:16:58 +0000
committerThurston Dang <thurston@google.com>2022-01-24 05:13:57 +0000
commit70b9383b977bd57b260dca8f9b7b02fbd6acf6ea (patch)
treed2b7ea8aa2fdf2778cdd177c0a920c246d1f4f8e /conf
parentda1cccc09e98aaf7df4cd6bc3ade8763ee8cb382 (diff)
downloadgs201-70b9383b977bd57b260dca8f9b7b02fbd6acf6ea.tar.gz
Backport 'Set /dev/sg1 permissions in ueventd.rc' to P22
... 'This way we don't need to guess when we need to chown.' This is Tri's change to init.gs101.rc (http://go/a-g/15447093), applied to init.<censored>.rc. Under some circumstances (see bug), storageproxyd needs to access /dev/sg1 but doesn't have permission, leading to other apps blocking on storage. Bug: 214910469 Test: Check that steps b/214910469#comment76 no longer gets stuck Change-Id: I9e4133b6bb9ffab1e0044a16b3582436ccf5dd44
Diffstat (limited to 'conf')
-rw-r--r--conf/init.gs201.rc1
-rw-r--r--conf/ueventd.gs201.rc3
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index fce0b75..4bf22b3 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -751,7 +751,6 @@ on post-fs-data
symlink /mnt/vendor/persist/ss /data/vendor/ss/persist
chown root system /data/vendor/ss/persist
chmod 0770 /data/vendor/ss/persist
- chown system system /dev/sg1
restart storageproxyd
diff --git a/conf/ueventd.gs201.rc b/conf/ueventd.gs201.rc
index ab3126b..b894ea3 100644
--- a/conf/ueventd.gs201.rc
+++ b/conf/ueventd.gs201.rc
@@ -162,6 +162,9 @@
/dev/trusty-ipc-dev0 0660 system drmrpc
/dev/trusty-log0 0660 system system
+# RPMB
+/dev/sg1 0660 system system
+
# Citadel
/dev/gsc0 0660 hsm hsm