From b89ad972add86211bbcc0d61f3c8f0efc2ab8333 Mon Sep 17 00:00:00 2001
From: Arian <arian.kulmer@web.de>
Date: Mon, 13 Apr 2020 23:43:49 +0200
Subject: [PATCH] davinci: rootdir: Cleanup on charger

* Don't enable adb
* Actually mount persist
* Don't split on charger to init.qcom.rc and init.target.rc

Change-Id: Ia4d6d1e417056a6b87358e384bd7a0bedcca1d63
---
 rootdir/etc/init.qcom.rc   | 11 ++---------
 rootdir/etc/init.target.rc |  8 ++++----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 92a92b0..1916909 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -899,7 +899,7 @@ service crashdata-sh /vendor/bin/init.qcom.crashdata.sh
     user root
     oneshot
 
-service qcom-post-boot /vendor/bin/init.qcom.post_boot.sh
+service vendor.qcom-post-boot /vendor/bin/init.qcom.post_boot.sh
     class late_start
     user root
     group root system wakelock graphics
@@ -926,7 +926,7 @@ service wifi-crda /vendor/bin/init.crda.sh
    oneshot
 
 on property:sys.boot_completed=1
-    start qcom-post-boot
+    start vendor.qcom-post-boot
     start qti-testscripts
 
 on property:ro.vendor.ril.mbn_copy_completed=1
@@ -1105,13 +1105,6 @@ service esepmdaemon /system/vendor/bin/esepmdaemon
     user system
     group nfc
 
-on charger
-    load_system_props
-    start qcom-post-boot
-    wait /dev/block/bootdevice/by-name/system
-    mount ext4 /dev/block/bootdevice/by-name/system / ro barrier=1
-    setprop sys.usb.config adb
-
 #add poweroffhandler
 service poweroffhandler /system/vendor/bin/poweroffhandler
     class core
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 6262c69..1d4e435 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -124,15 +124,15 @@ on property:sys.shutdown.requested=*
     stop vendor.per_proxy
 
 on charger
-    setprop vendor.usb.controller a600000.dwc3
-    setprop sys.usb.configfs 1
-    symlink /dev/block/platform/soc/1da4000.ufshc /dev/block/bootdevice
+    wait /dev/block/platform/soc/1da4000.ufshc/by-name/system
+    mount ext4 /dev/block/platform/soc/1da4000.ufshc/by-name/system / ro barrier=1
 
-    mkdir /mnt/vendor/persist 0771 root system
     wait /dev/block/platform/soc/1da4000.ufshc/by-name/persist
+    mount ext4 /dev/block/bootdevice/by-name/persist /mnt/vendor/persist nosuid nodev barrier=1
 
     start vendor.hvdcp_opti
     start vendor.thermal-engine
+    start vendor.qcom-post-boot
     start vendor.power_off_alarm
 
 service vendor.thermal-engine /vendor/bin/thermal-engine