From 745ca561703ba2ed92d193ad5582deb7414a2ff3 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Tue, 10 Oct 2023 18:46:21 +0900 Subject: [PATCH] Revert "universal7885: Support changing readonly filesystem type with a flag" This reverts commit 740b27bccff90599afe359a50bb488203312d6a1. --- universal7885-common/BoardConfigCommon.mk | 4 +--- universal7885-common/rootdir/etc/fstab.exynos7885 | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk index bbd556a..ee3ae58 100644 --- a/universal7885-common/BoardConfigCommon.mk +++ b/universal7885-common/BoardConfigCommon.mk @@ -82,9 +82,7 @@ include device/samsung/universal7885-common/configs/vintf/manifest.mk # Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 37748736 -TARGET_FS_TYPE ?= ext4 -BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := $(TARGET_FS_TYPE) -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := $(TARGET_FS_TYPE) +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 131072 # Properties diff --git a/universal7885-common/rootdir/etc/fstab.exynos7885 b/universal7885-common/rootdir/etc/fstab.exynos7885 index f5f4d9d..69cc42d 100644 --- a/universal7885-common/rootdir/etc/fstab.exynos7885 +++ b/universal7885-common/rootdir/etc/fstab.exynos7885 @@ -3,6 +3,8 @@ # 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 and vendor partition will be early-mounted by kernel +# /dev/block/platform/13500000.dwmmc0/by-name/system /system ext4 ro wait /dev/block/platform/13500000.dwmmc0/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait /dev/block/platform/13500000.dwmmc0/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait /dev/block/platform/13500000.dwmmc0/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime wait,check,reservedsize=128M @@ -11,12 +13,6 @@ /dev/block/platform/13500000.dwmmc0/by-name/misc /misc emmc defaults defaults /dev/block/platform/13500000.dwmmc0/by-name/omr /metadata ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,first_stage_mount,formattable,check -# Erofs support (Override DTBO fstab) -/dev/block/platform/13500000.dwmmc0/by-name/system /system ext4 ro wait,first_stage_mount -/dev/block/platform/13500000.dwmmc0/by-name/system /system erofs ro wait,first_stage_mount -/dev/block/platform/13500000.dwmmc0/by-name/vendor /vendor ext4 ro wait,first_stage_mount -/dev/block/platform/13500000.dwmmc0/by-name/vendor /vendor erofs ro wait,first_stage_mount - # VOLD :: fstab.a20e /dev/block/platform/13500000.dwmmc0/by-name/hidden /preload ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic voldmanaged=preload:auto,check /devices/platform/13550000.dwmmc2/mmc_host/mmc1* auto vfat defaults voldmanaged=sdcard:auto