From 5353fe7961a088127096c6b2cc455cce8b0dcc44 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Fri, 18 Feb 2022 23:11:48 +0800 Subject: [PATCH] Add alternative ext4 system mount line to facilitate compliance testing During compliance testing, the system partition image is replaced with GSI. However GSI is ext4, so we need an ext4 mount line for GSI to fallback to, since the first erofs line would fail to mount. Bug: 220074274 Test: Boot with GSI Change-Id: Id69fab591feb9cfd378de432c51f3058a3ab8b9c --- conf/fstab.gs201.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in index 8d7ee918..a3cdfe0a 100644 --- a/conf/fstab.gs201.in +++ b/conf/fstab.gs201.in @@ -5,6 +5,8 @@ # # system /system erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +# During compliance testing, the previous line would fail (because GSI is ext4), and the next line would be used to mount GSI. +system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system_ext /system_ext erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 product /product erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor erofs ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128