aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2018-10-08 00:25:18 +0100
committerArian <arian.kulmer@web.de>2019-10-25 22:17:12 +0200
commitda35b73c5608359950ab49cbee5ac82b19c4364a (patch)
tree282028f3dc2f96b0ee7542eafc144f619169fb1d
parent8966517b05277b37d3f627b4447efbe96e4bfbea (diff)
shinano-common: Create root folders outside of vendor init script
* The core SELinux policies for vendor_init are being restricted as to comply with Treble. Simply adding a local rule to allow creating folders under rootfs would be enough, but at the same time defining the extra root folders and making use of AID/fs configuration file to set perms is more neat and clean. * Furthermore, with System As Root / is a read-only filesystem so we can't create our mountpoints from init script anymore Change-Id: Idabd7ae72e4c4fd9daac5ba3be3e6236f79f251b
-rw-r--r--BoardConfigCommon.mk2
-rw-r--r--config.fs11
-rw-r--r--rootdir/etc/init.camera.rc6
3 files changed, 13 insertions, 6 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 41b1a0f..84f2e3b 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -61,6 +61,7 @@ TARGET_USES_MEDIA_EXTENSIONS := true
# Filesystem
BOARD_FLASH_BLOCK_SIZE := 131072
+TARGET_FS_CONFIG_GEN += $(COMMON_PATH)/config.fs
TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_USE_F2FS := true
@@ -75,6 +76,7 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 20971520
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16777216
BOARD_CACHEIMAGE_PARTITION_SIZE := 209715200
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2671771648
+BOARD_ROOT_EXTRA_FOLDERS := idd lta-label
# Recovery
TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom
diff --git a/config.fs b/config.fs
new file mode 100644
index 0000000..007f52d
--- /dev/null
+++ b/config.fs
@@ -0,0 +1,11 @@
+[idd/]
+mode: 0751
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
+
+[lta-label/]
+mode: 0555
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
diff --git a/rootdir/etc/init.camera.rc b/rootdir/etc/init.camera.rc
index ae8a21f..eec2b78 100644
--- a/rootdir/etc/init.camera.rc
+++ b/rootdir/etc/init.camera.rc
@@ -22,12 +22,6 @@ on early-fs
exec u:r:qti_init_shell:s0 -- /sbin/wait4tad_static
on fs
- # SONY: create mount point for idd
- mkdir /idd 0751 system system
-
- # SONY: setup idd partition
- chown system system /idd
- chmod 0751 /idd
exec u:r:qti_init_shell:s0 -- /system/bin/rm -r /idd/lost+found
symlink /idd /mnt/idd
restorecon_recursive /idd