From 2994aa888cde6587502cc49076026403fbcf02e5 Mon Sep 17 00:00:00 2001 From: 7Soldier Date: Wed, 14 Sep 2022 06:18:59 +0300 Subject: [PATCH] [SQUASH] hiphi: recovery/root: Import TWRP flags and refactor fstab Co-authored-by: brigudav Co-authored-by: sekaiacg Co-authored-by: TheMalachite Co-authored-by: SVB Co-authored-by: Pranav-Talmale <67180305+Pranav-Talmale@users.noreply.github.com> Co-authored-by: Aseem Athale Signed-off-by: 7Soldier --- recovery/root/system/etc/recovery.fstab | 60 ++++++++++++++++++++----- recovery/root/system/etc/twrp.flags | 58 ++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 10 deletions(-) create mode 100644 recovery/root/system/etc/twrp.flags diff --git a/recovery/root/system/etc/recovery.fstab b/recovery/root/system/etc/recovery.fstab index 30571fc..885dcc3 100644 --- a/recovery/root/system/etc/recovery.fstab +++ b/recovery/root/system/etc/recovery.fstab @@ -1,10 +1,50 @@ -/system ext4 system flags=display=system;logical;slotselect -/system_ext ext4 system_ext flags=display=system_ext;logical;slotselect -/product ext4 product flags=display=product;logical;slotselect -/vendor ext4 vendor flags=display=vendor;logical;slotselect -/odm ext4 odm flags=display=odm;logical;slotselect -/metadata ext4 /dev/block/bootdevice/by-name/metadata flags=display=metadata -/data f2fs /dev/block/bootdevice/by-name/userdata flags=display=data -/sdcard vfat /dev/block/mmcblk0p1 flags=display=sdcard -/boot emmc /dev/block/bootdevice/by-name/boot flags=display=boot -/misc emmc /dev/block/bootdevice/by-name/misc flags=display=misc +# Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted (subject to the limitations in the +# disclaimer below) provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# * Neither the name of The Linux Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE +# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT +# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# 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 + +# +system /system ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey +system /system erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.a> +system_ext /system_ext ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount +system_ext /system_ext erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount +product /product ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta_system,logical,first_stage_mount +product /product erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount +vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount +vendor /vendor erofs ro wait,slotselect,avb,logical,first_stage_mount +vendor_dlkm /vendor_dlkm ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount +vendor_dlkm /vendor_dlkm erofs ro wait,slotselect,avb,logical,first_stage_mount +/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount +/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized+wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,metadata_encryption=aes-256-xts:wrappedkey_v0,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults diff --git a/recovery/root/system/etc/twrp.flags b/recovery/root/system/etc/twrp.flags new file mode 100644 index 0000000..caa5e21 --- /dev/null +++ b/recovery/root/system/etc/twrp.flags @@ -0,0 +1,58 @@ +# 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 + +# Currently we dont have e2fsck compiled. So fs check would failed. + +# +# Boot partitions +/boot emmc /dev/block/bootdevice/by-name/boot flags=display="Boot";slotselect;backup=1;flashimg=1 +/dtbo emmc /dev/block/bootdevice/by-name/dtbo flags=display="DTBO";slotselect;backup=1;flashimg=1 +/vendor_boot emmc /dev/block/bootdevice/by-name/vendor_boot flags=display="Vendor Boot";slotselect;backup=1;flashimg=1 +/vbmeta emmc /dev/block/bootdevice/by-name/vbmeta flags=display="VBMeta";slotselect;backup=1;flashimg=1 +/vbmeta_system emmc /dev/block/bootdevice/by-name/vbmeta_system flags=display="System VBMeta";slotselect;backup=1;flashimg=1 +/recovery emmc /dev/block/bootdevice/by-name/recovery flags=display="Recovery";slotselect;backup=1;flashimg=1 +/logo emmc /dev/block/bootdevice/by-name/logo flags=display="Logo";slotselect;backup=1 +/misc emmc /dev/block/bootdevice/by-name/misc flags=display="Misc" + +# Logical partitions +/system ext4 system flags=display="System" +/system erofs system flags=display="System" +/system_ext ext4 system_ext flags=display="System EXT" +/system_ext erofs system_ext flags=display="System EXT" +/product ext4 product flags=display="Product" +/product erofs product flags=display="Product" +/vendor ext4 vendor flags=display="Vendor" +/vendor erofs vendor flags=display="Vendor" +/vendor_dlkm ext4 vendor_dlkm flags=display="Vendor DLKM" +/vendor_dlkm erofs vendor_dlkm flags=display="Vendor DLKM" + +# Flashable logical partitions +/system_image emmc /dev/block/bootdevice/by-name/system flags=display="System Image";backup=1;flashimg=1 +/system_ext_image emmc /dev/block/bootdevice/by-name/system_ext flags=display="System EXT Image";backup=1;flashimg=1 +/product_image emmc /dev/block/bootdevice/by-name/product flags=display="Product Image";backup=1;flashimg=1 +/vendor_image emmc /dev/block/bootdevice/by-name/vendor flags=display="Vendor Image";backup=1;flashimg=1 +/vendor_dlkm_image emmc /dev/block/bootdevice/by-name/vendor_dlkm flags=display="Vendor DLKM Image";backup=1;flashimg=1 + +# Data partitions +/metadata ext4 /dev/block/by-name/metadata flags=display="Metadata" + +# Firmware partitions +/persist ext4 /dev/block/bootdevice/by-name/persist flags=display="Persist" +/persist_image emmc /dev/block/bootdevice/by-name/persist flags=display="Persist";backup=1;flashimg=1 +/prodpersist ext4 /dev/block/bootdevice/by-name/prodpersist flags=display="Product Persist" +/prodpersist_image emmc /dev/block/bootdevice/by-name/prodpersist flags=display="Product Persist";backup=1;flashimg=1 +/firmware ext4 /dev/block/bootdevice/by-name/modem flags=display="Firmware";slotselect;fsflags="context=u:object_r:firmware_file:s0" +/bt_firmware ext4 /dev/block/bootdevice/by-name/bluetooth flags=display="Bluetooth";slotselect;fsflags="context=u:object_r:bt_firmware_file:s0" +/fsg ext4 /dev/block/bootdevice/by-name/fsg flags=display="FSG";slotselect;fsflags="context=u:object_r:fsg_file:s0" +/dsp ext4 /dev/block/bootdevice/by-name/dsp flags=display="DSP";slotselect +/modem_image emmc /dev/block/bootdevice/by-name/modem flags=display="Modem";slotselect;backup=1;flashimg=1 +/bluetooth_image emmc /dev/block/bootdevice/by-name/bluetooth flags=display="Bluetooth";slotselect;backup=1;flashimg=1 +/dsp_image emmc /dev/block/bootdevice/by-name/dsp flags=display="DSP";slotselect;backup=1;flashimg=1 +/efs1 emmc /dev/block/bootdevice/by-name/modemst1 flags=display="EFS";backup=1 +/efs2 emmc /dev/block/bootdevice/by-name/modemst2 flags=backup=1;subpartitionof=/efs1 +/efsc emmc /dev/block/bootdevice/by-name/fsc flags=backup=1;subpartitionof=/efs1 +/efsg emmc /dev/block/bootdevice/by-name/fsg flags=backup=1;subpartitionof=/efs1 + +# Removable storage +/usb_otg vfat /dev/block/sdg1 /dev/block/sdg flags=display="USB Storage";storage;wipeingui;removable;fsflags="utf8"