diff options
| author | Jin Qian <jinqian@google.com> | 2017-03-10 12:14:54 -0800 |
|---|---|---|
| committer | Jin Qian <jinqian@google.com> | 2017-04-04 18:19:23 +0000 |
| commit | 4761c45f02b2998182d7e7145846fc1c95cb2f90 (patch) | |
| tree | f5187d3daab43174f891c35afb2f0b14e70375ba /ext4_utils/mkuserimg_mke2fs.sh | |
| parent | 2fbc9b893f804e904a73505312e7d9a4ab80fcff (diff) | |
| download | extras-4761c45f02b2998182d7e7145846fc1c95cb2f90.tar.gz | |
ext4_utils: add default mke2fs.conf
Copy default configs from borg build machine and enable ext_attr.
Bug: 34947454
Test: make systemimage
Change-Id: I011b3d119f35beb0e78b804e62deff229775a0b0
(cherry picked from commit 87eb12642f68f5a8594893618cfab128da82ebd8)
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 |