From 49a4d989ad9e07f51d456d54a47e5adf1d2bad37 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Sat, 17 Aug 2024 11:27:21 -0700 Subject: [PATCH] Move setup of the persist partition to init.persist.rc The setup of the persist partition is moved to init.persist.rc. This will make easier to configure 16kb targets in follow up changes. Bug: 347015136 Test: $ source build/envsetup.sh $ lunch [zumapro]-trunk_staging-userdebug $ m $ ./vendor/google/tools/flashall -w Flag: EXEMPT bugfix Change-Id: Ifd17fc1f25ea8cf73470630e14a38116e0b7b96a --- conf/init.efs.rc | 4 +--- conf/init.persist.rc | 43 ++++++++++++++++++++++++++++++++++++++ conf/init.zumapro.board.rc | 40 +---------------------------------- device.mk | 3 ++- 4 files changed, 47 insertions(+), 43 deletions(-) create mode 100644 conf/init.persist.rc diff --git a/conf/init.efs.rc b/conf/init.efs.rc index a3664d9..340976c 100644 --- a/conf/init.efs.rc +++ b/conf/init.efs.rc @@ -1,8 +1,6 @@ -on early-init - mount_all /vendor/etc/fstab.persist --early - on late-fs mount_all /vendor/etc/fstab.efs --early + # for modem related functions restorecon_recursive /mnt/vendor/efs chown radio system /mnt/vendor/efs restorecon_recursive /mnt/vendor/efs_backup diff --git a/conf/init.persist.rc b/conf/init.persist.rc new file mode 100644 index 0000000..ee68337 --- /dev/null +++ b/conf/init.persist.rc @@ -0,0 +1,43 @@ +on early-init + mount_all /vendor/etc/fstab.persist --early + setprop ro.vendor.persist.status mounted + +on property:ro.vendor.persist.status=mounted + # for battery defender + mkdir /mnt/vendor/persist/battery 0700 system system + + # Camera factory calibration files + chmod 0771 /mnt/vendor/persist/camera + chmod 0771 /mnt/vendor/persist/camera/OTP_calibration + chmod 0771 /mnt/vendor/persist/camera/pdaf_calibration_data + mkdir /mnt/vendor/persist/camera/rear 0771 system camera + chmod 0771 /mnt/vendor/persist/camera/rear + + restorecon_recursive /mnt/vendor/persist + restorecon_recursive /mnt/vendor/persist/aoc + restorecon_recursive /mnt/vendor/persist/audio + restorecon_recursive /mnt/vendor/persist/sensors + restorecon_recursive /mnt/vendor/persist/battery + restorecon_recursive /mnt/vendor/persist/camera + restorecon_recursive /mnt/vendor/persist/modem + # Set up display-related directories and permissions + # Add restorecon_recursive command to make sure the restorecon label is persist_display_file. + restorecon_recursive /mnt/vendor/persist/display + mkdir /mnt/vendor/persist/data/sfs 0700 system system + mkdir /mnt/vendor/persist/data/tz 0700 system system + mkdir /mnt/vendor/persist/touch 0770 system system + +on property:ro.fstype.data=* && property:ro.vendor.persist.status=mounted + # Proxy for Secure Storage + mkdir /data/vendor/rebootescrow 0770 hsm hsm + mkdir /data/vendor/ss 0770 root system + mkdir /mnt/vendor/persist/ss 0770 root system + restorecon_recursive /mnt/vendor/persist/ss + 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 /data/vendor/ss/0 + chown system system /data/vendor/ss/persist/0 + chown system system /data/vendor/ss/persist/nsp + + restart storageproxyd diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 92b21e3..c369eb7 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -1,5 +1,6 @@ import /vendor/etc/init/hw/init.zumapro.usb.rc import /vendor/etc/init/hw/init.efs.rc +import /vendor/etc/init/hw/init.persist.rc import android.hardware.drm@1.2-service.widevine.rc import init.exynos.sensorhub.rc import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.soc.rc @@ -268,13 +269,6 @@ on post-fs-data chown system system /dev/ispolin_ranging chmod 0660 /dev/ispolin_ranging - # Factory calibration files - chmod 0771 /mnt/vendor/persist/camera - chmod 0771 /mnt/vendor/persist/camera/OTP_calibration - chmod 0771 /mnt/vendor/persist/camera/pdaf_calibration_data - mkdir /mnt/vendor/persist/camera/rear 0771 system camera - chmod 0771 /mnt/vendor/persist/camera/rear - # Audio dump and debug mkdir /data/vendor/audio 0770 audio audio @@ -369,27 +363,10 @@ on property:persist.vendor.radio.no_modem_board=1 on fs mount_all --early - # for battery defender - mkdir /mnt/vendor/persist/battery 0700 system system - # Mount modem partition mount_all /vendor/etc/fstab.modem --early restorecon_recursive /mnt/vendor/modem_img - restorecon_recursive /mnt/vendor/persist - restorecon_recursive /mnt/vendor/persist/aoc - restorecon_recursive /mnt/vendor/persist/audio - restorecon_recursive /mnt/vendor/persist/sensors - restorecon_recursive /mnt/vendor/persist/battery - restorecon_recursive /mnt/vendor/persist/camera - restorecon_recursive /mnt/vendor/persist/modem - # Set up display-related directories and permissions - # Add restorecon_recursive command to make sure the restorecon label is persist_display_file. - restorecon_recursive /mnt/vendor/persist/display - mkdir /mnt/vendor/persist/data/sfs 0700 system system - mkdir /mnt/vendor/persist/data/tz 0700 system system - mkdir /mnt/vendor/persist/touch 0770 system system - # Permissions for ION chmod 0660 /sys/class/ion_cma/ion_video_ext/isolated chown system system /sys/class/ion_cma/ion_video_ext/isolated @@ -635,21 +612,6 @@ service bugreport /system/bin/dumpstate -d -p -z oneshot keycodes 114 115 116 -# Proxy for Secure Storage -on post-fs-data - mkdir /data/vendor/rebootescrow 0770 hsm hsm - mkdir /data/vendor/ss 0770 root system - mkdir /mnt/vendor/persist/ss 0770 root system - restorecon_recursive /mnt/vendor/persist/ss - 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 /data/vendor/ss/0 - chown system system /data/vendor/ss/persist/0 - chown system system /data/vendor/ss/persist/nsp - - restart storageproxyd - service storageproxyd /vendor/bin/storageproxyd \ -d /dev/trusty-ipc-dev0 \ -r /dev/sg1 \ diff --git a/device.mk b/device.mk index 5fba40f..34e2975 100644 --- a/device.mk +++ b/device.mk @@ -451,7 +451,8 @@ PRODUCT_COPY_FILES += \ device/google/zumapro/conf/init.zumapro.soc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zumapro.soc.rc \ device/google/zumapro/conf/init.zuma.soc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.soc.rc \ device/google/zumapro/conf/init.zumapro.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zumapro.board.rc \ - device/google/zumapro/conf/init.efs.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.efs.rc + device/google/zumapro/conf/init.efs.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.efs.rc \ + device/google/zumapro/conf/init.persist.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.persist.rc ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \