Merge pull request #613 from ix5/toolbox-context

[Q-COMPAT] Change toybox run context, update selinux xattr
sonyxperiadev · Jul 29, 2019 · afc15bf · afc15bf
2 parents 0e27d04 + 305913c
commit afc15bf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/rootdir/vendor/etc/init/hw/init.common.rc b/rootdir/vendor/etc/init/hw/init.common.rc
@@ -94,8 +94,10 @@ on fs
     # CDSP devices
     start cdspstart_sh
 
-    # Remove "security.restorecon_last" xattr from /mnt/vendor/persist/
-    exec u:r:vendor_init:s0 root root -- /vendor/bin/toybox_vendor setfattr -x security.restorecon_last /mnt/vendor/persist/
+    # (Android <= 9): Remove "security.restorecon_last" xattr from /mnt/vendor/persist/
+    exec u:r:vendor_toolbox:s0 root root -- /vendor/bin/toybox_vendor setfattr -x security.restorecon_last /mnt/vendor/persist/
+    # (Android >= 10): Remove "security.sehash" xattr from /mnt/vendor/persist/
+    exec u:r:vendor_toolbox:s0 root root -- /vendor/bin/toybox_vendor setfattr -x security.sehash /mnt/vendor/persist/
     # And force restoring of SELinux labels
     restorecon_recursive /mnt/vendor/persist/