commit 3b9050c80b8e95c44695ec8d019888712b029b79
author Pat Tjin <pattjin@google.com> Wed Dec 07 07:15:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 07 07:15:47 2016 +0000
tree 1adf04ac55eea068d55fe602a412af1b93145e70
parent 5564824d90536475cb13aff994c89c6c91d272fb
parent 9db54ab7b31ab3cde716b65751f87b3aff80fe02

Merge "make_ext4fs: add option to specify the number of inodes" am: 33d9ecbf96
am: 9db54ab7b3

Change-Id: Iceb76b0636157932347bb52de827f398e21f2766

ext4_utils/mkuserimg.sh

diff --git a/ext4_utils/mkuserimg.sh b/ext4_utils/mkuserimg.sh
index b79baf9..08c75be 100755
--- a/ext4_utils/mkuserimg.sh
+++ b/ext4_utils/mkuserimg.sh
@@ -6,7 +6,9 @@
 cat<<EOT
 Usage:
 mkuserimg.sh [-s] SRC_DIR OUTPUT_FILE EXT_VARIANT MOUNT_POINT SIZE [-j <journal_size>]
-             [-T TIMESTAMP] [-C FS_CONFIG] [-D PRODUCT_OUT] [-B BLOCK_LIST_FILE] [-d BASE_ALLOC_FILE_IN ] [-A BASE_ALLOC_FILE_OUT ] [-L LABEL] [FILE_CONTEXTS]
+             [-T TIMESTAMP] [-C FS_CONFIG] [-D PRODUCT_OUT] [-B BLOCK_LIST_FILE]
+             [-d BASE_ALLOC_FILE_IN ] [-A BASE_ALLOC_FILE_OUT ] [-L LABEL]
+             [-i INODES ] [FILE_CONTEXTS]
 EOT
 }
 
@@ -85,6 +87,11 @@
   shift; shift
 fi
 
+INODES=
+if [[ "$1" == "-i" ]]; then
+  INODES=$2
+  shift; shift
+fi
 FC=$1
 
 case $EXT_VARIANT in
@@ -121,6 +128,9 @@
 if [ -n "$LABEL" ]; then
   OPT="$OPT -L $LABEL"
 fi
+if [ -n "$INODES" ]; then
+  OPT="$OPT -i $INODES"
+fi
 
 MAKE_EXT4FS_CMD="make_ext4fs $ENABLE_SPARSE_IMAGE -T $TIMESTAMP $OPT -l $SIZE $JOURNAL_FLAGS -a $MOUNT_POINT $OUTPUT_FILE $SRC_DIR $PRODUCT_OUT"
 echo $MAKE_EXT4FS_CMD