darkkirb/android_device_lenovo_msm8937-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

msm8937-common: Get rid of recovery-only fstab

Browse source 
* 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.
This commit is contained in:
Michael Bestas 2018-02-27 20:00:45 +00:00 committed by Isaac Chen
parent b93a294b74
commit 2858a9103a
3 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/recovery.mk
View file

@ -1,2 +1,2 @@
# Recovery
TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/fstab.full
TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/fstab.qcom

22
rootdir/fstab.full
View file

@ -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 rw,nosuid,nodev,noatime wait,formattable,check,encryptable=footer
/dev/block/bootdevice/by-name/userdata /data ext4 rw,nosuid,nodev,noatime,noauto_da_alloc wait,formattable,check,encryptable=footer
/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr 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 nosuid,nodev wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=footer
/devices/soc/78db000.usb/msm_hsusb_host* auto auto nosuid,nodev wait,voldmanaged=usbotg:auto
/dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4

7
rootdir/fstab.qcom
View file

@ -2,14 +2,17 @@
# The filesystem that contains the filesystem e2fsck binary (typically /system) cannot
# specify 'check', and must come before any filesystems that do specify 'check'
# NOTE: /system partition is now early-mounted and the fstab entry is specified in device tree:
# /proc/device-tree/firmware/android/fstab/system
# NOTE: /system and /vendor (/cust mounted as /vendor) partitions are now early-mounted and the fstab entry is specified in device tree (duplicated below for recovery image purposes only):
# /proc/device-tree/firmware/android/fstab/system
# /proc/device-tree/firmware/android/fstab/vendor
#<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/userdata /data f2fs rw,nosuid,nodev,noatime wait,formattable,check,encryptable=footer
/dev/block/bootdevice/by-name/userdata /data ext4 rw,nosuid,nodev,noatime,noauto_da_alloc wait,formattable,check,encryptable=footer
/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly
/dev/block/bootdevice/by-name/cust /vendor ext4 ro,barrier=1 wait,recoveryonly
/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr 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