From 6696e265ee3adb97ab4af993d26f1aee3f19f35f Mon Sep 17 00:00:00 2001 From: Donnie Pollitz Date: Wed, 6 Mar 2024 15:46:07 +0100 Subject: [PATCH] storageproxyd: Integrate new command arguments Background: * Adds argument to explicitly define storage backings for secure storage files. Storageproxy will also internally manage the creation of symlinks as necessary (Useful for determining if a userdata wipe has occurred). * Adds an argument to define the max size for file backed storages. Bug: 324989972 Test: Storage port tests running Signed-off-by: Donnie Pollitz (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:72c31fc3e4515eaf1ffccfb225c3bee52e5988b2) Merged-In: Iafdf6d87a786665c118cd652243a34842f5f789d Change-Id: Iafdf6d87a786665c118cd652243a34842f5f789d --- conf/init.zumapro.board.rc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 2279e47..7c67878 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -663,16 +663,20 @@ 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 - symlink /dev/block/platform/13200000\.ufs/by-name/trusty_persist /data/vendor/ss/persist/0 - symlink /dev/block/platform/13200000\.ufs/by-name/trusty_userdata /data/vendor/ss/0 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 -p /data/vendor/ss -t ufs +service storageproxyd /vendor/bin/storageproxyd \ + -d /dev/trusty-ipc-dev0 \ + -r /dev/sg1 \ + -p /data/vendor/ss \ + -t ufs \ + -f 0:/dev/block/platform/13200000\.ufs/by-name/trusty_userdata \ + -f persist/0:/dev/block/platform/13200000\.ufs/by-name/trusty_persist \ + -m /dev/block/platform/13200000\.ufs/by-name/trusty_userdata class early_hal user system group system