From 637840c1e285dd6a98de76cefbcb1a156a5f8c6f Mon Sep 17 00:00:00 2001
From: Benergy Meenan Ravuri <bravuri@codeaurora.org>
Date: Thu, 29 Oct 2020 16:45:50 +0530
Subject: [PATCH] sm8350-common: init.target.rc: move spunvm partition out of
 lahaina/shima fstab

move spunvm partition out of fstab and mount in init.target.rc
only for lahaina as shima doesn't have spunvm partition.

Change-Id: I2b19c7cf84f23c0f73103fff2a2a7ae5a7dd186a
CRs-Fixed: 2801834
---
 rootdir/etc/fstab.qcom     | 3 ---
 rootdir/etc/init.target.rc | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index ad54819..3780689 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -45,6 +45,3 @@ odm                                                     /odm                   e
 /dev/block/bootdevice/by-name/vm-bootsys                /vendor/vm-system      ext4    ro,nosuid,nodev,barrier=1                            wait,slotselect
 /dev/block/bootdevice/by-name/bluetooth                 /vendor/bt_firmware    vfat    ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect
 /dev/block/bootdevice/by-name/qmcs                      /mnt/vendor/qmcs       vfat    nosuid,nodev,context=u:object_r:vendor_qmcs_file:s0   wait,check,formattable
-
-# mount spunvm partition to /mnt/vendor/spunvm for UEFI IAR-DB
-/dev/block/bootdevice/by-name/spunvm                    /mnt/vendor/spunvm     vfat    rw,noatime,shortname=lower,uid=1000,gid=1000,dmask=007,fmask=007,context=u:object_r:vendor_spunvm_file:s0 wait
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 7f61fcc..1c3de19 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -83,6 +83,11 @@ on fs
     mkdir /mnt/vendor/persist/haptics 0755 system system
     mkdir /mnt/vendor/persist/audio 0755 system system
 
+on fs && property:ro.boot.product.vendor.sku=lahaina
+    mkdir /mnt/vendor/spunvm 0660 system system
+    wait /dev/block/bootdevice/by-name/spunvm
+    mount vfat /dev/block/bootdevice/by-name/spunvm /mnt/vendor/spunvm rw noatime shortname=lower,uid=1000,gid=1000,dmask=007,fmask=007,context=u:object_r:vendor_spunvm_file:s0
+
 on post-fs
     # Set RLIMIT_MEMLOCK to 64MB
     setrlimit 8 67108864 67108864