Skip to content

Commit 7724fd2

Browse files
author
Arafattex
authored
Merge pull request Shas45558#5 from gitclone-url/11
On the way to release
2 parents 64323b3 + d2f8c1f commit 7724fd2

File tree

7 files changed

+1179
-23
lines changed

7 files changed

+1179
-23
lines changed

‎recovery.fstab‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
2+
# Userdata partition
3+
/dev/block/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,inline_xattr,inline_data latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2,keydirectory=/metadata/vold/metadata_encryption,reservedsize=128M,checkpoint=fs,formattable
4+
5+
# Need to have this entry in here even though the mount point itself is no longer needed.
6+
# The update_engine code looks for this entry in order to determine the boot device address
7+
# and fails if it does not find it.
8+
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
9+
110
/spl emmc /dev/block/mmcblk0boot0 flags=display=spl;slotselect
211
/spl_bk emmc /dev/block/mmcblk0boot1 flags=display=spl_bk
312
/uboot emmc /dev/block/by-name/uboot flags=display=uboot;slotselect

‎recovery/root/system/etc/event-log-tags‎

Lines changed: 478 additions & 0 deletions
Large diffs are not rendered by default.

‎recovery/root/system/etc/fstab.postinstall‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#
2+
# Copyright (C) 2018 The Android Open Source Project
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
17+
system /postinstall ext4 ro,nosuid,nodev,noexec slotselect_other,logical,avb_keys=/product/etc/security/avb/system_other.avbpubkey

‎recovery/root/system/etc/recovery.fstab‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# Core Partitions (Dynamic Partitions, erofs)
2+
system /system erofs ro wait,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
3+
vendor /vendor erofs ro wait,avb,logical,first_stage_mount
4+
product /product erofs ro wait,logical,first_stage_mount
5+
system_ext /system_ext erofs ro wait,logical,first_stage_mount
6+
7+
# Core Partitions (Dynamic Partitions, ext4)
8+
system /system ext4 ro wait,avb=vbmeta_system,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey
9+
vendor /vendor ext4 ro wait,avb,logical,first_stage_mount
10+
product /product ext4 ro wait,logical,first_stage_mount
11+
system_ext /system_ext ext4 ro wait,logical,first_stage_mount
12+
113
/dev/block/mmcblk0boot0 /spl emmc defaults slotselect
214
/dev/block/mmcblk0boot1 /spl_bk emmc defaults defaults
315
/dev/block/by-name/uboot /uboot emmc defaults slotselect
@@ -46,8 +58,6 @@ product /product e
4658
product /product erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
4759
vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount
4860
vendor /vendor erofs ro wait,slotselect,avb,logical,first_stage_mount
49-
odm /odm ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount
50-
odm /odm erofs ro wait,slotselect,avb,logical,first_stage_mount
5161
/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,wrappedkey,first_stage_mount
5262
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
5363

@@ -57,3 +67,13 @@ odm /odm e
5767
/dev/block/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,inline_xattr,inline_data latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2,keydirectory=/metadata/vold/metadata_encryption,reservedsize=128M,checkpoint=fs,formattable
5868
/dev/block/by-name/prodnv /mnt/vendor ext4 noatime,nosuid,nodev,nomblk_io_submit,noauto_da_alloc wait,check
5969
/dev/block/mmcblk1p1 /storage/sdcard0 vfat defaults defaults
70+
71+
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
72+
# Userdata partition
73+
/dev/block/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,inline_xattr,inline_data latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2,keydirectory=/metadata/vold/metadata_encryption,reservedsize=128M,checkpoint=fs,formattable
74+
75+
# Need to have this entry in here even though the mount point itself is no longer needed.
76+
# The update_engine code looks for this entry in order to determine the boot device address
77+
# and fails if it does not find it.
78+
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
79+

0 commit comments

Comments
 (0)