diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2020-04-21 17:52:44 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2020-04-21 17:52:44 +0800 |
| commit | bbb804e57f2fde108eba4085623dc1bf55fffcca (patch) | |
| tree | 04b4ac8590f6496e5e172c4101a0e4a8ea0180df | |
| parent | b822c952205e0aa242efe649b9f84372a6bf8537 (diff) | |
db845c: move the normal fstab path to /vendor/etc/fstab.db845c
as it is required by the GetFstabPath funtion defined here:
https://android.googlesource.com/platform/system/core/+/refs/heads/master/fs_mgr/fs_mgr_fstab.cpp#411
and the fstab.ramdisk.common does not need to be copied to vendor partition.
Test: boot up db845c with android-5.4 and android-mainline kernels, and tested with vts-kernel -m VtsKernelEncryptionTest
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ib2ec7277e3b4e912546841174bdcb5638578ed33
| -rw-r--r-- | db845c/device.mk | 3 | ||||
| -rw-r--r-- | init.common.rc | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/db845c/device.mk b/db845c/device.mk index 5cdd38d..cc5b973 100644 --- a/db845c/device.mk +++ b/db845c/device.mk @@ -24,8 +24,7 @@ PRODUCT_COPY_FILES := \ $(DB845C_KERNEL_DIR)/Image.gz:kernel \ $(DB845C_KERNEL_DIR)/sdm845-db845c.dtb:dtb.img \ device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_RAMDISK)/fstab.db845c \ - device/linaro/dragonboard/fstab.ramdisk.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.db845c \ - device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.db845c \ + device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.db845c \ device/linaro/dragonboard/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.db845c.rc \ device/linaro/dragonboard/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.db845c.usb.rc \ device/linaro/dragonboard/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/db845c.kl diff --git a/init.common.rc b/init.common.rc index 988a5e1..2ce8b0a 100644 --- a/init.common.rc +++ b/init.common.rc @@ -2,8 +2,8 @@ import init.${ro.hardware}.usb.rc import init.${ro.hardware}.power.rc on fs - mount_all /vendor/etc/init/fstab.${ro.hardware} - swapon_all /vendor/etc/init/fstab.${ro.hardware} + mount_all /vendor/etc/fstab.${ro.hardware} + swapon_all /vendor/etc/fstab.${ro.hardware} on post-fs # set RLIMIT_MEMLOCK to 64MB |