commit 1c17647ad02f4ca219b0da28decba56c95e187b2
author Yongqin Liu <yongqin.liu@linaro.org> Tue Apr 21 17:31:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 17:31:32 2020 +0000
tree 50a5fcc0c030aaa8dead910d7f15912dcd663902
parent 33cea4413256f2384ee08364d373ca806b58811d
parent 8261110478d9efbff7c5742fe02d18b495749c17

db845c: move the normal fstab path to /vendor/etc/fstab.db845c am: bbb804e57f am: 3f0824d37e am: cbf763f11a am: 8261110478

Change-Id: Ie305c1da4a3c50785df9c9df300d630e2549b688

db845c/device.mk

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 @@
     $(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

init.common.rc

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}.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