From c83d95716c85564b779059824dcc253b7c7013c7 Mon Sep 17 00:00:00 2001 From: Rashed Abdel-Tawab Date: Fri, 8 Sep 2017 17:48:17 -0700 Subject: [PATCH] msm8976-common: 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 --- BoardConfigCommon.mk | 2 +- rootdir/etc/fstab.full | 24 ++++++++++++++++++++++++ rootdir/etc/fstab.qcom | 5 ++--- 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 rootdir/etc/fstab.full diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index cfa24d1..b27f5dd 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -196,7 +196,7 @@ OVERRIDE_RS_DRIVER := libRSDriver_adreno.so USE_OPENGL_RENDERER := true # Recovery -TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.qcom +TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.full TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true diff --git a/rootdir/etc/fstab.full b/rootdir/etc/fstab.full new file mode 100644 index 0000000..12e9558 --- /dev/null +++ b/rootdir/etc/fstab.full @@ -0,0 +1,24 @@ +# Android fstab file. +# The filesystem that contains the filesystem e2fsck binary (typically /system) cannot +# specify 'check', and must come before any filesystems that do specify 'check' +# + +/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,nodiratime,inline_xattr,data_flush wait,check,encryptable=footer,formattable,length=-16384 +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,nodiratime,barrier=1,noauto_da_alloc wait,check,encryptable=footer,formattable,length=-16384 +/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,nodiratime,inline_xattr,flush_merge,data_flush wait,check,formattable +/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,nodiratime,barrier=1 wait,check,formattable +/dev/block/bootdevice/by-name/apnhlos /firmware vfat ro,shortname=lower,dmask=222,fmask=333,context=u:object_r:firmware_file:s0 wait +/dev/block/bootdevice/by-name/modem /firmware-modem vfat ro,shortname=lower,dmask=222,fmask=333,context=u:object_r:firmware_file:s0 wait +/dev/block/bootdevice/by-name/dsp /dsp ext4 nosuid,nodev,barrier=1 wait +/dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,barrier=1 wait +/dev/block/bootdevice/by-name/config /frp emmc defaults defaults +/dev/block/bootdevice/by-name/fota /misc emmc defaults defaults +/dev/block/bootdevice/by-name/efs /efs ext4 nosuid,nodev,noauto_da_alloc,journal_async_commit,data=ordered,errors=panic wait,check + +/dev/block/bootdevice/by-name/boot /boot emmc defaults recoveryonly +/dev/block/bootdevice/by-name/recovery /recovery emmc defaults recoveryonly + +# SDCard +/devices/soc.0/7864900.sdhci/mmc_host* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata +/devices/platform/msm_hsusb_host/usb* auto auto defaults voldmanaged=usb:auto diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 61d0de4..dc3d911 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -1,9 +1,8 @@ # 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 +# The filesystem that contains the filesystem e2fsck binary (typically /system) cannot +# specify 'check', and must come before any filesystems that do specify 'check' # -/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait /dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,nodiratime,inline_xattr,data_flush wait,check,encryptable=footer,formattable,length=-16384 /dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,nodiratime,barrier=1,noauto_da_alloc wait,check,encryptable=footer,formattable,length=-16384 /dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,nodiratime,inline_xattr,flush_merge,data_flush wait,check,formattable