From c97e120d74723d60f7635b5d04fae6611b6c59dc Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 17 Jul 2024 16:00:38 +0000 Subject: [PATCH] copy_efs_files_to_data.sh: handle symlinks Temporary fix, until dump.f2fs is fixed to handle these as well. Bug: 352567354 Change-Id: I3fd1815cfca6438a61a26f8afaada77b771e871c Flag: BUGFIX Test: husky:/ # getconf PAGE_SIZE 16384 husky:/ # ls -l /mnt/vendor/persist/ss/ total 3044 lrwxrwxrwx 1 system system 55 2024-07-17 15:12 0 -> /dev/block/platform/13200000.ufs/by-name/trusty_persist -rwxrwxrwx 1 system system 55 2024-07-17 15:12 0_backup -rw-r-x--- 1 system system 3106816 2024-07-17 15:12 nsp --- copy_efs_files_to_data.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/copy_efs_files_to_data.sh b/copy_efs_files_to_data.sh index 2ac9e462..96c3a386 100644 --- a/copy_efs_files_to_data.sh +++ b/copy_efs_files_to_data.sh @@ -2,7 +2,7 @@ CHECKPOINT_DIR=/data/vendor/copied -BIN_DIR=/vendor/bin +export BIN_DIR=/vendor/bin $BIN_DIR/mkdir -p $CHECKPOINT_DIR @@ -21,12 +21,12 @@ function copy_files_to_data() echo "Failed to $BIN_DIR/dump.f2fs -rfPo $tmpdir $block_device" return fi - mv $tmpdir $build_checkpoint + $BIN_DIR/mv $tmpdir $build_checkpoint if [ $? -ne 0 ]; then echo "mv $tmpdir $build_checkpoint" return fi - fsync `dirname $build_checkpoint` + $BIN_DIR/fsync `dirname $build_checkpoint` fi echo "Successfully copied $mount_point to $build_checkpoint" } @@ -36,3 +36,10 @@ copy_files_to_data "/dev/block/by-name/efs_backup" "/mnt/vendor/efs_backup" copy_files_to_data "/dev/block/by-name/modem_userdata" "/mnt/vendor/modem_userdata" copy_files_to_data "/dev/block/by-name/persist" "/mnt/vendor/persist" + +# TODO(b/352567354): fixup symlinks until dump.f2fs is fixed +a=$($BIN_DIR/cat /data/vendor/copied/persist/ss/0) +$BIN_DIR/mv /data/vendor/copied/persist/ss/0 /data/vendor/copied/persist/ss/0_backup +$BIN_DIR/ln -s $a /data/vendor/copied/persist/ss/0 + +$BIN_DIR/fsync /data/vendor/copied