diff options
| author | Ying Wang <wangying@google.com> | 2014-11-18 18:06:56 -0800 |
|---|---|---|
| committer | Jeff Hao <jeffhao@google.com> | 2014-11-19 13:48:59 -0800 |
| commit | 8f85f69f43dc3a2943d33d0d47740b2528a0735f (patch) | |
| tree | a4ed74e81e3128b5d95c5f00db96dce048f27593 | |
| parent | 844b2e166c6218018e9676994cff8d5d2a8cbf62 (diff) | |
| download | extras-8f85f69f43dc3a2943d33d0d47740b2528a0735f.tar.gz | |
Support [-j <journal_size>] in mkuserimg.sh
Bug: 18430740
(cherry picked from commit 1ec61e7ac5fd7553b143231e8d650ef4ba432344)
Change-Id: I8704dfd4f91373261b03d7943e40cc9fdf39a0a7
| -rwxr-xr-x | ext4_utils/mkuserimg.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ext4_utils/mkuserimg.sh b/ext4_utils/mkuserimg.sh index c8b83e0a..436e8f1d 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 @@ MOUNT_POINT=$4 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 @@ if [ -n "$BLOCK_LIST" ]; then 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 |