From 8cd50b7bf21035141c6eecd7a13ca5ae91a037b2 Mon Sep 17 00:00:00 2001
From: Vaibhav Agrawal <vagrawa@codeaurora.org>
Date: Thu, 19 Nov 2020 15:00:03 +0530
Subject: [PATCH] sm8350-common: shima: Support ufs and emmc variant fstab
 files

Two fstabs are needed to support different data unit number (dun)
size for ufs and emmc hardwares. This needs different encryption
flag in fstab to address the difference in dun size.

[ArianK16a: don't add the emmc fstab since all our devices are ufs]

Test: Verified bootup, vts_kernel_encryption, fscryptctl.

Change-Id: Iff03422d39c789c544bdd86faef070ae46eb4e0e
---
 common.mk                  | 6 +++---
 rootdir/etc/init.target.rc | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common.mk b/common.mk
index b9d5552..3d684bd 100644
--- a/common.mk
+++ b/common.mk
@@ -180,9 +180,9 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/etc/charger_fstab.qcom:$(TARGET_COPY_OUT_VENDOR)/etc/charger_fstab.qcom
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.qcom \
-    $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.qcom \
-    $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.qcom
+    $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.default \
+    $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.default \
+    $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.default
 
 # GPS
 PRODUCT_PACKAGES += \
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 5367455..2a270bb 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -75,7 +75,7 @@ on early-fs
 on fs
     start hwservicemanager
     mkdir /mnt/vendor/spunvm 0660 system system
-    mount_all /vendor/etc/fstab.qcom --early
+    mount_all --early
     chown root system /mnt/vendor/persist
     chmod 0771 /mnt/vendor/persist
     restorecon_recursive /mnt/vendor/persist
@@ -95,7 +95,7 @@ on post-fs
 on late-fs
     wait_for_prop hwservicemanager.ready true
     start console
-    mount_all /vendor/etc/fstab.qcom --late
+    mount_all --late
 
 on post-fs-data
     mkdir /vendor/data/tombstones 0771 system system