From 740b27bccff90599afe359a50bb488203312d6a1 Mon Sep 17 00:00:00 2001 From: Tim Zimmermann Date: Thu, 6 Oct 2022 10:17:08 +0200 Subject: [PATCH] universal7885: Support changing readonly filesystem type with a flag [roynatech2544: Rename flag to TARGET_FS_TYPE] Change-Id: Ie9c749a37b3d42844b1824ab1cdb7a2fa51a186b --- universal7885-common/BoardConfigCommon.mk | 4 +++- universal7885-common/rootdir/etc/fstab.exynos7884B | 8 ++++++-- universal7885-common/rootdir/etc/fstab.exynos7904 | 8 ++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk index 3c089ff..e338ed3 100644 --- a/universal7885-common/BoardConfigCommon.mk +++ b/universal7885-common/BoardConfigCommon.mk @@ -81,7 +81,9 @@ include device/samsung/universal7885-common/configs/vintf/manifest.mk # Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 37748736 -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_FS_TYPE ?= ext4 +BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := $(TARGET_FS_TYPE) +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := $(TARGET_FS_TYPE) BOARD_FLASH_BLOCK_SIZE := 131072 # Properties diff --git a/universal7885-common/rootdir/etc/fstab.exynos7884B b/universal7885-common/rootdir/etc/fstab.exynos7884B index 69cc42d..f5f4d9d 100644 --- a/universal7885-common/rootdir/etc/fstab.exynos7884B +++ b/universal7885-common/rootdir/etc/fstab.exynos7884B @@ -3,8 +3,6 @@ # 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 @@ -13,6 +11,12 @@ /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 diff --git a/universal7885-common/rootdir/etc/fstab.exynos7904 b/universal7885-common/rootdir/etc/fstab.exynos7904 index 69cc42d..f5f4d9d 100644 --- a/universal7885-common/rootdir/etc/fstab.exynos7904 +++ b/universal7885-common/rootdir/etc/fstab.exynos7904 @@ -3,8 +3,6 @@ # 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 @@ -13,6 +11,12 @@ /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