diff options
| author | Jin Qian <jinqian@google.com> | 2017-04-04 21:54:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-04 21:54:28 +0000 |
| commit | 1cf3416564814839b12aa354495b85fc631b3bf5 (patch) | |
| tree | 54e9534cd33557edb8a45012d7bb125ea8050aa4 /ext4_utils/mkuserimg_mke2fs.sh | |
| parent | f92a38e36b87f89f1d51f49c7c2020be0a0f753e (diff) | |
| parent | 4761c45f02b2998182d7e7145846fc1c95cb2f90 (diff) | |
| download | extras-1cf3416564814839b12aa354495b85fc631b3bf5.tar.gz | |
Merge "ext4_utils: add default mke2fs.conf" into oc-dev
Diffstat (limited to 'ext4_utils/mkuserimg_mke2fs.sh')
| -rwxr-xr-x | ext4_utils/mkuserimg_mke2fs.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext4_utils/mkuserimg_mke2fs.sh b/ext4_utils/mkuserimg_mke2fs.sh index 7d5d2e35..64b1fe3f 100755 --- a/ext4_utils/mkuserimg_mke2fs.sh +++ b/ext4_utils/mkuserimg_mke2fs.sh @@ -42,9 +42,6 @@ MOUNT_POINT=$4 SIZE=$5 shift; shift; shift; shift; shift -# selinux requires ext_attr. -MKE2FS_OPTS+="-O ext_attr " - if [ "$1" = "-j" ]; then if [ "$2" = "0" ]; then MKE2FS_OPTS+="-O ^has_journal" @@ -146,7 +143,7 @@ cat /dev/null >$OUTPUT_FILE MAKE_EXT4FS_CMD="mke2fs $MKE2FS_OPTS -t $EXT_VARIANT -b $BLOCKSIZE $OUTPUT_FILE $SIZE" echo $MAKE_EXT4FS_CMD -$MAKE_EXT4FS_CMD +MKE2FS_CONFIG=./system/extras/ext4_utils/mke2fs.conf $MAKE_EXT4FS_CMD if [ $? -ne 0 ]; then exit 4 fi |