msm8937-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
This commit is contained in:
Rashed Abdel-Tawab 2017-09-08 17:48:17 -07:00 committed by Isaac Chen
parent d5cb31a5c2
commit 42101c780e
3 changed files with 29 additions and 6 deletions

View file

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

21
rootdir/fstab.full Normal file
View file

@ -0,0 +1,21 @@
# 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/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

View file

@ -1,11 +1,13 @@
# Android fstab file. # Android fstab file.
# The filesystem that contains the filesystem checker binary (typically /system) cannot # The filesystem that contains the filesystem e2fsck binary (typically /system) cannot
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # 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
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> #<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/boot /boot emmc defaults defaults
/dev/block/bootdevice/by-name/recovery /recovery 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/userdata /data f2fs rw,nosuid,nodev,noatime wait,formattable,check,encryptable=footer /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/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 f2fs nosuid,nodev,noatime,inline_xattr wait,formattable,check
@ -16,6 +18,6 @@
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
/dev/block/bootdevice/by-name/config /frp 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/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 /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 /dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4