From 58d5c19d6b660e5e93eb3b7bcc7a8cfeb5d6b6df Mon Sep 17 00:00:00 2001 From: Michael Bestas <mkbestas@lineageos.org> Date: Wed, 28 Feb 2018 01:30:00 +0530 Subject: [PATCH] msm8953-common: Get rid of recovery-only fstab * Mounting /system and /vendor partitions is handled in kernel now, however removing the entries 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: I4dec55a9e64d21f04d88b8664a58ce054e6e682c --- BoardConfigCommon.mk | 2 +- rootdir/fstab.qcom | 2 ++ rootdir/recovery/fstab.qcom | 22 ---------------------- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 rootdir/recovery/fstab.qcom diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 2737359..9a39673 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -196,7 +196,7 @@ TARGET_RIL_VARIANT := caf ifeq ($(AB_OTA_UPDATER), true) TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/fstab_AB.qcom else -TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/recovery/fstab.qcom +TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/fstab.qcom endif # SELinux diff --git a/rootdir/fstab.qcom b/rootdir/fstab.qcom index 005d3a3..297a04b 100644 --- a/rootdir/fstab.qcom +++ b/rootdir/fstab.qcom @@ -6,6 +6,8 @@ /dev/block/bootdevice/by-name/boot /boot emmc defaults defaults /dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults +/dev/block/bootdevice/by-name/system /system ext4 ro wait,recoveryonly +/dev/block/bootdevice/by-name/cust /vendor ext4 ro wait,recoveryonly /dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer,formattable,length=-16384 /dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,noauto_da_alloc wait,check,encryptable=footer,formattable,length=-16384 /dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,formattable,check diff --git a/rootdir/recovery/fstab.qcom b/rootdir/recovery/fstab.qcom deleted file mode 100644 index c883cd0..0000000 --- a/rootdir/recovery/fstab.qcom +++ /dev/null @@ -1,22 +0,0 @@ -# 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 - -#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> -/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults -/dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults - -/dev/block/bootdevice/by-name/system /system ext4 ro wait -/dev/block/bootdevice/by-name/cust /vendor ext4 ro wait -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer,formattable,length=-16384 -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,noauto_da_alloc wait,check,encryptable=footer,formattable,length=-16384 -/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,formattable,check -/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime wait,formattable,check -/dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev wait,check -/dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev wait -/dev/block/bootdevice/by-name/modem /firmware vfat ro,context=u:object_r:firmware_file:s0,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337 wait -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/bootdevice/by-name/config /frp emmc defaults defaults - -/devices/soc/7864900.sdhci/mmc_host* auto auto defaults wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=userdata -/devices/soc/7000000.ssusb/7000000.dwc3/xhci-hcd.0.auto* auto auto defaults wait,voldmanaged=usb:auto -- GitLab