From 3153e88e4dcefc12b0a0d1e1067ecbcf14c471d2 Mon Sep 17 00:00:00 2001 From: Davide Garberi Date: Wed, 6 Sep 2023 20:46:56 +0200 Subject: msm8996-common: rootdir: Decommonize fstab Change-Id: I6238b5627a2f4bb819397641f21110db0d7fe6a3 --- msm8996.mk | 1 - rootdir/Android.mk | 8 -------- rootdir/etc/fstab.qcom | 25 ------------------------- 3 files changed, 34 deletions(-) delete mode 100644 rootdir/etc/fstab.qcom diff --git a/msm8996.mk b/msm8996.mk index 8aaf426..f787598 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -144,7 +144,6 @@ PRODUCT_PACKAGES += \ # Common init scripts PRODUCT_PACKAGES += \ - fstab.qcom \ init.bt.sh \ init.msm.usb.configfs.rc \ init.qcom.rc \ diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 35a0e0b..9dc63dc 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -28,14 +28,6 @@ include $(BUILD_PREBUILT) # Common init scripts -include $(CLEAR_VARS) -LOCAL_MODULE := fstab.qcom -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/fstab.qcom -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := init.msm.usb.configfs.rc LOCAL_MODULE_TAGS := optional diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom deleted file mode 100644 index 074cb6f..0000000 --- a/rootdir/etc/fstab.qcom +++ /dev/null @@ -1,25 +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' - -# NOTE: /system and /vendor (/factory 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 - -# -/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 ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,latemount -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,latemount -/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly -/dev/block/bootdevice/by-name/factory /vendor ext4 ro,barrier=1 wait,recoveryonly -/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check -/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check -/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,noatime,barrier=1 wait -/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1,context=u:object_r:adsprpcd_file:s0 wait -/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=222,fmask=333,context=u:object_r:bt_firmware_file:s0 wait -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4 - -/devices/soc/6a00000.ssusb/6a00000.dwc3/xhci-hcd.0.auto/usb* auto auto defaults voldmanaged=usbdisk:auto -- cgit v1.2.3