diff options
| author | John Stultz <john.stultz@linaro.org> | 2020-10-06 05:33:49 +0000 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2020-10-06 06:23:32 +0000 |
| commit | e53665ed853fdcc6d5723e4893845cc8536e6189 (patch) | |
| tree | 08d0848c80ccb1a20f2239e2c4cc26f05e478ec1 | |
| parent | 70f37c65199443d2502da58ecb81a4be28d36d80 (diff) | |
db845c: Unify fstab files to fix issues w/ adb remount
The overlayfs remount handling of superpartitions expects the
fstab to have all the partitions in it.
This means we can't use the split between the ramdisk fstab
and the vendor fstab that we have been previously.
So this patch merges the two fstabs together.
With this change "adb root; adb remount" works now.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Iad408d5d3b1e4c9291a947cd44ee65f4aaef5c45
| -rw-r--r-- | db845c/device.mk | 2 | ||||
| -rw-r--r-- | fstab.common | 12 | ||||
| -rw-r--r-- | fstab.ramdisk.common | 4 | ||||
| -rw-r--r-- | pixel3_mainline/device.mk | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/db845c/device.mk b/db845c/device.mk index b37e06f..c6825a3 100644 --- a/db845c/device.mk +++ b/db845c/device.mk @@ -23,7 +23,7 @@ $(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-he PRODUCT_COPY_FILES := \ $(DB845C_KERNEL_DIR)/Image.gz:kernel \ $(DB845C_KERNEL_DIR)/sdm845-db845c.dtb:dtb.img \ - device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_RAMDISK)/fstab.db845c \ + device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_RAMDISK)/fstab.db845c \ device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.db845c \ device/linaro/dragonboard/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.db845c.rc \ device/linaro/dragonboard/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.db845c.usb.rc \ diff --git a/fstab.common b/fstab.common index 9634d9c..733ab06 100644 --- a/fstab.common +++ b/fstab.common @@ -1,8 +1,8 @@ -# Android fstab file. -#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> -# 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 +system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount /dev/block/platform/soc@0/1d84000.ufshc/by-name/userdata /data ext4 discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized -/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable -/devices/platform/soc@0/8804000.sdhci/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto +/dev/block/platform/soc@0/1d84000.ufshc/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable /dev/block/platform/soc@0/1d84000.ufshc/by-name/cache /cache ext4 nodev,noatime,nosuid,errors=panic wait +/devices/platform/soc@0/8804000.sdhci/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto +vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount +system_ext /system_ext ext4 noatime,ro,errors=panic wait,logical,first_stage_mount +product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount diff --git a/fstab.ramdisk.common b/fstab.ramdisk.common deleted file mode 100644 index 9554d4e..0000000 --- a/fstab.ramdisk.common +++ /dev/null @@ -1,4 +0,0 @@ -system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount -vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount -system_ext /system_ext ext4 noatime,ro,errors=panic wait,logical,first_stage_mount -product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount diff --git a/pixel3_mainline/device.mk b/pixel3_mainline/device.mk index 8109ad3..e394c60 100644 --- a/pixel3_mainline/device.mk +++ b/pixel3_mainline/device.mk @@ -19,7 +19,7 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk) PRODUCT_COPY_FILES := \ - device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_RAMDISK)/fstab.pixel3_mainline \ + device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_RAMDISK)/fstab.pixel3_mainline \ device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.pixel3_mainline \ device/linaro/dragonboard/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.pixel3_mainline.rc \ device/linaro/dragonboard/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.pixel3_mainline.usb.rc \ |