diff options
| author | Rashed Abdel-Tawab <rashed@linux.com> | 2017-09-08 17:48:17 -0700 |
|---|---|---|
| committer | Ali Alasadi <alasadi56@gmail.com> | 2018-05-10 07:54:37 +0000 |
| commit | 2911c6ef81ddb042eb229027250b86aeb3e02bea (patch) | |
| tree | 7a5ff0b8adda4f8a1ca977ca5d61417b4d7f1081 | |
| parent | 5a5bf8fbb8457012587c3512a6e64e53128263c7 (diff) | |
athene: Update for early-mounted system partition
* This removes /system entry from fstab, since this partition
is now early-mounted and the fstab entry is specified in device tree.
* At the same time, also include a fully populated fstab, in order to avoid
build breakage while generating recovery updater scripts.
Change-Id: I8e558458b984e97a45a920c3751a6b7c3f2ebc5c
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rw-r--r-- | rootdir/etc/fstab.qcom | 2 | ||||
| -rw-r--r-- | rootdir/etc/recovery.fstab | 22 |
3 files changed, 24 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index ac13a91..23416ce 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -218,7 +218,7 @@ USE_SENSOR_MULTI_HAL := true # Recovery BOARD_HAS_NO_SELECT_BUTTON := true -TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom +TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/recovery.fstab TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true LZMA_RAMDISK_TARGETS := recovery diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 22371f3..482344a 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -6,7 +6,7 @@ # Currently we dont have e2fsck compiled. So fs check would failed. #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> -/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait +#/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait /dev/block/bootdevice/by-name/userdata /data f2fs rw,nosuid,nodev,noatime,nodiratime,inline_xattr,inline_data wait,check,formattable,encryptable=/dev/block/bootdevice/by-name/metadata /dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc wait,check,formattable,encryptable=/dev/block/bootdevice/by-name/metadata /dev/block/bootdevice/by-name/cache /cache ext4 rw,nosuid,nodev,noatime,barrier=1,data=ordered wait,check,formattable diff --git a/rootdir/etc/recovery.fstab b/rootdir/etc/recovery.fstab new file mode 100644 index 0000000..578faa1 --- /dev/null +++ b/rootdir/etc/recovery.fstab @@ -0,0 +1,22 @@ +# Android fstab file. +# The filesystem that contains the filesystem checker binary (typically /system) cannot +# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK + +#TODO: Add 'check' as fs_mgr_flags with data partition. +# Currently we dont have e2fsck compiled. So fs check would failed. + +#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> +/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait +/dev/block/bootdevice/by-name/userdata /data f2fs rw,nosuid,nodev,noatime,nodiratime,inline_xattr,inline_data wait,check,formattable,encryptable=/dev/block/bootdevice/by-name/metadata +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc wait,check,formattable,encryptable=/dev/block/bootdevice/by-name/metadata +/dev/block/bootdevice/by-name/cache /cache ext4 rw,nosuid,nodev,noatime,barrier=1,data=ordered wait,check,formattable +/dev/block/bootdevice/by-name/fsg /fsg ext4 ro,nosuid,nodev,barrier=0 wait +/dev/block/bootdevice/by-name/modem /firmware ext4 ro,nosuid,nodev,barrier=0 wait +/dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,barrier=1,noatime,noauto_da_alloc wait +/dev/block/bootdevice/by-name/boot /boot emmc defaults recoveryonly +/dev/block/bootdevice/by-name/recovery /recovery emmc defaults recoveryonly +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults + +/devices/soc.0/7864900.sdhci/mmc_host* auto auto nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=userdata +/devices/platform/msm_hsusb* auto auto nosuid,nodev wait,voldmanaged=usb:auto +/dev/block/zram0 none swap defaults zramsize=536870912 |