summaryrefslogtreecommitdiff
path: root/squashfs_utils
diff options
context:
space:
mode:
authorMohamad Ayyash <mkayyash@google.com>2016-04-08 17:39:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-04-08 17:39:06 +0000
commitb317b33a844ef2b5c072c07ead43be2c096c28b8 (patch)
tree8a0f8b7109355db11086744ac2260d33a578bb64 /squashfs_utils
parenta8be0cf6f2bff90f6e3e89bba12c2e2473a2063d (diff)
parentaa8b3553d9c5b0f89d13df6412af0dd1e25e5a3b (diff)
downloadextras-b317b33a844ef2b5c072c07ead43be2c096c28b8.tar.gz
Merge "Remove canned_fs_config from ext4_utils" into nyc-dev
Diffstat (limited to 'squashfs_utils')
-rwxr-xr-xsquashfs_utils/mksquashfsimage.sh11
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