From 3a418b23107d07c88ed33578025db83bf009c3e8 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 27 Feb 2018 20:00:45 +0000 Subject: [PATCH] msm8976-common: Get rid of recovery-only fstab * Mounting /system partition is handled in kernel now, however removing the entry from fstab caused issues building the OTA. The workaround was to have a separate fstab, but turns out that simply setting the recoveryonly flag does the trick because those are then ignored during a normal Android boot. Change-Id: I2944384d0a1c41bc9f9f51e2e29daff2bed0a0f4 --- BoardConfigCommon.mk | 2 +- rootdir/etc/fstab.full | 24 ------------------------ rootdir/etc/fstab.qcom | 1 + 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 rootdir/etc/fstab.full diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 40566e9..697d3bb 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -197,7 +197,7 @@ OVERRIDE_RS_DRIVER := libRSDriver_adreno.so USE_OPENGL_RENDERER := true # Recovery -TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.full +TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.qcom TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true diff --git a/rootdir/etc/fstab.full b/rootdir/etc/fstab.full deleted file mode 100644 index 12e9558..0000000 --- a/rootdir/etc/fstab.full +++ /dev/null @@ -1,24 +0,0 @@ -# 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 dc3d911..c30004d 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -3,6 +3,7 @@ # specify 'check', and must come before any filesystems that do specify 'check' # +/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly /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