diff options
| -rw-r--r-- | BoardConfigCommon.mk | 5 | ||||
| -rw-r--r-- | rootdir/Android.mk | 12 | ||||
| -rw-r--r-- | rootdir/etc/fstab.qcom | 28 | ||||
| -rw-r--r-- | rootdir/etc/fstab_AB.qcom | 17 | ||||
| -rw-r--r-- | sdm660.mk | 3 |
5 files changed, 1 insertions, 64 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f423161..013deaf 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -194,11 +194,6 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop # Recovery -ifeq ($(AB_OTA_UPDATER), true) -TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_AB.qcom -else -TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom -endif BOARD_HAS_LARGE_FILESYSTEM := true # RIL diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 8282c49..1d50930 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -85,18 +85,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) -LOCAL_MODULE := fstab.qcom -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -ifeq ($(AB_OTA_UPDATER), true) -LOCAL_SRC_FILES := etc/fstab_AB.qcom -else -LOCAL_SRC_FILES := etc/fstab.qcom -endif -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) LOCAL_MODULE := init.goodix.sh LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom deleted file mode 100644 index 215d548..0000000 --- a/rootdir/etc/fstab.qcom +++ /dev/null @@ -1,28 +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 - -# NOTE: /system and /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 - -#TODO: Add 'check' as fs_mgr_flags with data partition. -# Currently we dont have e2fsck compiled. So fs check would failed. - -# Non-A/B fstab.qcom variant -#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier wait,quota,encryptable=footer -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime,errors=panic wait,resize,check,encryptable=footer,crashcheck,quota -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait -/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait -/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto -/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait -/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier wait,quota -/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait -/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check -/devices/soc/c084000.sdhci/mmc_host* auto auto nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer - -/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly -/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,recoveryonly -/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults diff --git a/rootdir/etc/fstab_AB.qcom b/rootdir/etc/fstab_AB.qcom deleted file mode 100644 index 2a16f53..0000000 --- a/rootdir/etc/fstab_AB.qcom +++ /dev/null @@ -1,17 +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 - -#TODO: Add 'check' as fs_mgr_flags with data partition. -# Currently we dont have e2fsck compiled. So fs check would failed. - -# A/B fstab.qcom variant -#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> -/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=0,noauto_da_alloc,discard,noatime,lazytime wait,resize,check,crashcheck,quota,encryptable=footer -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect -/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect -/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto -/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect -/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check @@ -272,8 +272,7 @@ PRODUCT_PACKAGES += \ init.qcom.usb.sh \ init.qti.fm.sh \ init.target.rc \ - ueventd.qcom.rc \ - fstab.qcom + ueventd.qcom.rc # IPv6 PRODUCT_PACKAGES += \ |