diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2016-04-07 22:15:57 -0700 |
|---|---|---|
| committer | Mohamad Ayyash <mkayyash@google.com> | 2016-04-07 22:15:57 -0700 |
| commit | aa8b3553d9c5b0f89d13df6412af0dd1e25e5a3b (patch) | |
| tree | 17187184b87dccc2100193af6b2b8cb6b20108bf /squashfs_utils | |
| parent | a4325d3d28e8d6b0c0509175726620c643c4924d (diff) | |
| download | extras-aa8b3553d9c5b0f89d13df6412af0dd1e25e5a3b.tar.gz | |
Remove canned_fs_config from ext4_utils
It is now also used in mksquashfs so it was added to libcutils
BUG: 27467028
Change-Id: I81c87938d5b6b200a8ad817f0c64c5ca699f451c
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Diffstat (limited to 'squashfs_utils')
| -rwxr-xr-x | squashfs_utils/mksquashfsimage.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/squashfs_utils/mksquashfsimage.sh b/squashfs_utils/mksquashfsimage.sh index 1bc2b83b..5f8cfeab 100755 --- a/squashfs_utils/mksquashfsimage.sh +++ b/squashfs_utils/mksquashfsimage.sh @@ -5,7 +5,7 @@ function usage() { cat<<EOT Usage: -${0##*/} SRC_DIR OUTPUT_FILE [-s] [-m MOUNT_POINT] [-d PRODUCT_OUT] [-c FILE_CONTEXTS] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT] +${0##*/} SRC_DIR OUTPUT_FILE [-s] [-m MOUNT_POINT] [-d PRODUCT_OUT] [-C FS_CONFIG ] [-c FILE_CONTEXTS] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT] EOT } @@ -42,6 +42,12 @@ if [[ "$1" == "-d" ]]; then shift; shift fi +FS_CONFIG= +if [[ "$1" == "-C" ]]; then + FS_CONFIG=$2 + shift; shift +fi + FILE_CONTEXTS= if [[ "$1" == "-c" ]]; then FILE_CONTEXTS=$2 @@ -74,6 +80,9 @@ fi if [ -n "$PRODUCT_OUT" ]; then OPT="$OPT -product-out $PRODUCT_OUT" fi +if [ -n "$FS_CONFIG" ]; then + OPT="$OPT -fs-config-file $FS_CONFIG" +fi if [ -n "$FILE_CONTEXTS" ]; then OPT="$OPT -context-file $FILE_CONTEXTS" fi |