commit 5cb93f016cff70190b89577ca3e8416ce3fd888a
author Utkarsh Sanghi <usanghi@google.com> Sat Dec 12 00:45:38 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 12 00:45:38 2015 +0000
tree b6442767f4d4b6f3d4f35625e86e49632dc28263
parent 7b153bf1bbbda58d1be395a77a26bce3e4bdf9ef
parent 18477d0ea05e3646417850e071225a52416b8eb8

Merge "trunks: Move BackgroundCommandTransceiver into libtrunks"

attestation/server/attestationd.conf

diff --git a/attestation/server/attestationd.conf b/attestation/server/attestationd.conf
index 0d5a74d..7d23f93 100644
--- a/attestation/server/attestationd.conf
+++ b/attestation/server/attestationd.conf
@@ -21,4 +21,10 @@
 stop on stopping boot-services
 respawn
 
+pre-start script
+  # Ensure attestationd will have permissions for attestation.epb.
+  chgrp preserve /mnt/stateful_partition/unencrypted/preserve
+  chmod 775 /mnt/stateful_partition/unencrypted/preserve
+end script
+
 exec /usr/sbin/attestationd

attestation/server/main.cc

diff --git a/attestation/server/main.cc b/attestation/server/main.cc
index b22ba18..1ba4405 100644
--- a/attestation/server/main.cc
+++ b/attestation/server/main.cc
@@ -52,6 +52,7 @@
   struct minijail* jail = minijail->New();
 
   minijail->DropRoot(jail, kAttestationUser, kAttestationGroup);
+  minijail_inherit_usergroups(jail);
   minijail->UseSeccompFilter(jail, kAttestationSeccompPath);
   minijail->Enter(jail);
   minijail->Destroy(jail);