not passing in -s caused a -E to be passed to mke2fs without any options
not passing in FILE_CONTEXTS caused a -S to be passed to e2fsdroid
without a file
Test: build oem image (doesn't pass in -s or [FILE_CONTEXTS])
Change-Id: Id00ca79b6b5fdc75e603ab568d74f1a183f8e56b
Signed-off-by: Ben Fennema <fennema@google.com>
fi
if [[ "$1" == "-e" ]]; then
fi
if [[ "$1" == "-e" ]]; then
- if [[ MKE2FS_EXTENDED_OPTS ]]; then
+ if [[ $MKE2FS_EXTENDED_OPTS ]]; then
MKE2FS_EXTENDED_OPTS+=","
fi
MKE2FS_EXTENDED_OPTS+="stripe_width=$(($2/BLOCKSIZE))"
MKE2FS_EXTENDED_OPTS+=","
fi
MKE2FS_EXTENDED_OPTS+="stripe_width=$(($2/BLOCKSIZE))"
fi
if [[ "$1" == "-o" ]]; then
fi
if [[ "$1" == "-o" ]]; then
- if [[ MKE2FS_EXTENDED_OPTS ]]; then
+ if [[ $MKE2FS_EXTENDED_OPTS ]]; then
MKE2FS_EXTENDED_OPTS+=","
fi
# stride should be the max of 8kb and the logical block size
MKE2FS_EXTENDED_OPTS+=","
fi
# stride should be the max of 8kb and the logical block size
-if [[ MKE2FS_EXTENDED_OPTS ]]; then
+if [[ $MKE2FS_EXTENDED_OPTS ]]; then
MKE2FS_OPTS+=" -E $MKE2FS_EXTENDED_OPTS"
fi
MKE2FS_OPTS+=" -E $MKE2FS_EXTENDED_OPTS"
fi
-E2FSDROID_OPTS+=" -S $1"
+if [[ $1 ]]; then
+ E2FSDROID_OPTS+=" -S $1"
+fi
case $EXT_VARIANT in
ext4) ;;
case $EXT_VARIANT in
ext4) ;;