commit d4c448cb1598badb2b12c38997912996812b2090
author Tianjie Xu <xunchang@google.com> Wed Dec 04 23:07:23 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 04 23:07:23 2019 +0000
tree 3465c357fe8d66f89983ead2330433fe78269a69
parent 3e9732f91c0f26c320f58d3a22e7ca3ce20856c9
parent ef9dc36236a1b77fa0d01c3a2a9e5a4f1ddc6b15

Merge "Factor out the hashtree info from the verity_info"

f2fs_utils/mkf2fsuserimg.sh

diff --git a/f2fs_utils/mkf2fsuserimg.sh b/f2fs_utils/mkf2fsuserimg.sh
index ef762dc..582f63c 100755
--- a/f2fs_utils/mkf2fsuserimg.sh
+++ b/f2fs_utils/mkf2fsuserimg.sh
@@ -8,7 +8,7 @@
 ${0##*/} OUTPUT_FILE SIZE
          [-C FS_CONFIG] [-f SRC_DIR] [-D PRODUCT_OUT]
          [-s FILE_CONTEXTS] [-t MOUNT_POINT] [-T TIMESTAMP]
-         [-L LABEL]
+         [-L LABEL] [-S]
 EOT
 }
 
@@ -26,6 +26,14 @@
 SIZE=$2
 shift; shift
 
+SPARSE_IMG="false"
+if [[ "$1" == "-S" ]]; then
+  MKFS_OPTS+=" -S $SIZE"
+  SLOAD_OPTS+=" -S"
+  SPARSE_IMG="true"
+  shift
+fi
+
 if [[ "$1" == "-C" ]]; then
   SLOAD_OPTS+=" -C $2"
   shift; shift
@@ -73,14 +81,26 @@
   exit 2
 fi
 
-MAKE_F2FS_CMD="make_f2fs -S $SIZE -g android $MKFS_OPTS $OUTPUT_FILE"
+if [ "$SPARSE_IMG" = "false" ]; then
+  TRUNCATE_CMD="truncate -s $SIZE $OUTPUT_FILE"
+  echo $TRUNCATE_CMD
+  $TRUNCATE_CMD
+  if [ $? -ne 0 ]; then
+    exit 3
+  fi
+fi
+
+MAKE_F2FS_CMD="make_f2fs -g android $MKFS_OPTS $OUTPUT_FILE"
 echo $MAKE_F2FS_CMD
 $MAKE_F2FS_CMD
 if [ $? -ne 0 ]; then
+  if [ "$SPARSE_IMG" = "false" ]; then
+    rm -f $OUTPUT_FILE
+  fi
   exit 4
 fi
 
-SLOAD_F2FS_CMD="sload_f2fs -S $SLOAD_OPTS $OUTPUT_FILE"
+SLOAD_F2FS_CMD="sload_f2fs $SLOAD_OPTS $OUTPUT_FILE"
 echo $SLOAD_F2FS_CMD
 $SLOAD_F2FS_CMD
 if [ $? -ne 0 ]; then