diff options
author | Thierry Strudel <tstrudel@google.com> | 2015-07-09 16:31:39 -0700 |
---|---|---|
committer | Thierry Strudel <tstrudel@google.com> | 2015-07-09 21:28:35 -0700 |
commit | b89e81dcb9bfa707912d9e370949b250367b0998 (patch) | |
tree | d27174b60eb4a4a466f74eb3f96feb76a2fd4f18 /ext4_utils/mkuserimg.sh | |
parent | 833eaf66268bd4a2e5535f9b203f3d7c0085baa6 (diff) | |
download | extras-b89e81dcb9bfa707912d9e370949b250367b0998.tar.gz |
fs_config: align with new explicit fs_config target_out parameter
Bug: 21989305
Bug: 22048934
Change-Id: I82c16c70a776e13b3365672b2820ee965525de9a
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Diffstat (limited to 'ext4_utils/mkuserimg.sh')
-rwxr-xr-x | ext4_utils/mkuserimg.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ext4_utils/mkuserimg.sh b/ext4_utils/mkuserimg.sh index 3a6006e3..8667013e 100755 --- a/ext4_utils/mkuserimg.sh +++ b/ext4_utils/mkuserimg.sh @@ -6,7 +6,7 @@ function usage() { cat<<EOT Usage: mkuserimg.sh [-s] SRC_DIR OUTPUT_FILE EXT_VARIANT MOUNT_POINT SIZE [-j <journal_size>] - [-T TIMESTAMP] [-C FS_CONFIG] [-B BLOCK_LIST_FILE] [-L LABEL] [FILE_CONTEXTS] + [-T TIMESTAMP] [-C FS_CONFIG] [-D PRODUCT_OUT] [-B BLOCK_LIST_FILE] [-L LABEL] [FILE_CONTEXTS] EOT } @@ -55,6 +55,12 @@ if [[ "$1" == "-C" ]]; then shift; shift fi +PRODUCT_OUT= +if [[ "$1" == "-D" ]]; then + PRODUCT_OUT=$2 + shift; shift +fi + BLOCK_LIST= if [[ "$1" == "-B" ]]; then BLOCK_LIST=$2 @@ -98,7 +104,7 @@ if [ -n "$LABEL" ]; then OPT="$OPT -L $LABEL" fi -MAKE_EXT4FS_CMD="make_ext4fs $ENABLE_SPARSE_IMAGE -T $TIMESTAMP $OPT -l $SIZE $JOURNAL_FLAGS -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 $PRODUCT_OUT" echo $MAKE_EXT4FS_CMD $MAKE_EXT4FS_CMD if [ $? -ne 0 ]; then |