commit 17ba6f0d475126d0a89d5f276d0973bc87df6bc9
author Paul Lawrence <paullawrence@google.com> Fri Nov 21 23:38:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 21 23:38:28 2014 +0000
tree 80d87b23e5a76f5a19ea3b021ce30376ab90783f
parent 4ea082291fdfd14969e537fe9f999bc380a98010
parent ac342b944b6bcb4b936e6cbcd9fb8be3e5262cd0

Merge "Add a reference C implementation for verifying signatures" into lmp-mr1-dev

ext4_utils/mkuserimg.sh

diff --git a/ext4_utils/mkuserimg.sh b/ext4_utils/mkuserimg.sh
index c8b83e0..436e8f1 100755
--- a/ext4_utils/mkuserimg.sh
+++ b/ext4_utils/mkuserimg.sh
@@ -5,7 +5,7 @@
 function usage() {
 cat<<EOT
 Usage:
-mkuserimg.sh [-s] SRC_DIR OUTPUT_FILE EXT_VARIANT MOUNT_POINT SIZE
+mkuserimg.sh [-s] SRC_DIR OUTPUT_FILE EXT_VARIANT MOUNT_POINT SIZE [-j <journal_size>]
              [-T TIMESTAMP] [-C FS_CONFIG] [-B BLOCK_LIST_FILE] [FILE_CONTEXTS]
 EOT
 }
@@ -33,6 +33,16 @@
 SIZE=$5
 shift; shift; shift; shift; shift
 
+JOURNAL_FLAGS=
+if [ "$1" = "-j" ]; then
+  if [ "$2" = "0" ]; then
+    JOURNAL_FLAGS="-J"
+  else
+    JOURNAL_FLAGS="-j $2"
+  fi
+  shift; shift
+fi
+
 TIMESTAMP=-1
 if [[ "$1" == "-T" ]]; then
   TIMESTAMP=$2
@@ -79,7 +89,7 @@
   OPT="$OPT -B $BLOCK_LIST"
 fi
 
-MAKE_EXT4FS_CMD="make_ext4fs $ENABLE_SPARSE_IMAGE -T $TIMESTAMP $OPT -l $SIZE -a $MOUNT_POINT $OUTPUT_FILE $SRC_DIR"
+MAKE_EXT4FS_CMD="make_ext4fs $ENABLE_SPARSE_IMAGE -T $TIMESTAMP $OPT -l $SIZE $JOURNAL_FLAGS -a $MOUNT_POINT $OUTPUT_FILE $SRC_DIR"
 echo $MAKE_EXT4FS_CMD
 $MAKE_EXT4FS_CMD
 if [ $? -ne 0 ]; then