From c9cde396deac18c35f526597f62a3b318d83e0ca Mon Sep 17 00:00:00 2001 From: Ocean Chen Date: Mon, 13 Dec 2021 10:46:26 +0800 Subject: [PATCH] gs101: create fstab.modem for project with modem Non-modem project does't inlucde the fstab.modem It can avoid long boot time from fs_mgr mount fail Bug: 209694809 Test: reboot test Change-Id: I3f1499f0c3767ba61895699e618856e41844b4bf Signed-off-by: Ocean Chen --- conf/fstab.gs101.in | 4 ---- conf/fstab.modem | 7 +++++++ conf/init.gs101.rc | 1 + device.mk | 4 ++++ 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 conf/fstab.modem diff --git a/conf/fstab.gs101.in b/conf/fstab.gs101.in index a88d1cc1..014c047f 100644 --- a/conf/fstab.gs101.in +++ b/conf/fstab.gs101.in @@ -10,10 +10,6 @@ product /product vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount vendor_dlkm /vendor_dlkm ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount /dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount -/dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs ext4 defaults,noatime,rw wait,check,formattable -/dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup ext4 defaults,noatime,rw wait,check,formattable -/dev/block/platform/14700000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata ext4 defaults,noatime,rw wait,check,formattable -/dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img ext4 ro,defaults,context=u:object_r:modem_img_file:s0,barrier=1 wait,slotselect /dev/block/platform/14700000.ufs/by-name/misc /misc emmc defaults wait /dev/block/platform/14700000.ufs/by-name/metadata /metadata ext4 noatime,nosuid,nodev,data=journal,commit=1 wait,check,formattable,first_stage_mount,metadata_csum /dev/block/platform/14700000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount diff --git a/conf/fstab.modem b/conf/fstab.modem new file mode 100644 index 00000000..44a936c1 --- /dev/null +++ b/conf/fstab.modem @@ -0,0 +1,7 @@ +# Android fstab file. +# +# Keep persist in an fstab file, since we need to run fsck on it after abnormal shutdown. +/dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs ext4 defaults,noatime,rw wait,check,formattable +/dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup ext4 defaults,noatime,rw wait,check,formattable +/dev/block/platform/14700000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata ext4 defaults,noatime,rw wait,check,formattable +/dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img ext4 ro,defaults,context=u:object_r:modem_img_file:s0,barrier=1 wait,slotselect diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 6cfc3657..69def36c 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -16,6 +16,7 @@ service vendor.charger /system/bin/charger on early-init mount_all /vendor/etc/fstab.persist --early + mount_all /vendor/etc/fstab.modem --early on init # CPU0 cannot be offline diff --git a/device.mk b/device.mk index 6589f0cf..d47e5692 100644 --- a/device.mk +++ b/device.mk @@ -251,6 +251,10 @@ PRODUCT_PACKAGES += \ fstab.gs101-fips.vendor_ramdisk PRODUCT_COPY_FILES += \ device/google/gs101/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist +ifneq ($(BOARD_WITHOUT_RADIO),true) +PRODUCT_COPY_FILES += \ + device/google/gs101/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem +endif # Shell scripts PRODUCT_COPY_FILES += \