summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRashed Abdel-Tawab <rashed@linux.com>2017-03-04 15:08:07 -0500
committerRashed Abdel-Tawab <rashed@linux.com>2017-03-05 22:28:18 -0500
commit56803863100f09cb84c92a967e7840630a977566 (patch)
treeeef61ef0c4fa9a916b5238fa0e24d911a17b6e1a
parent80ff896b1eb6456ae76a8097b61e14cdbaf28ec6 (diff)
msm8996: rootdir: Always copy qcril.db and fix vold mounts
Change-Id: Idd482557ff96e71f05e32dec4b976a1c6f3db87c
-rw-r--r--rootdir/etc/fstab.qcom2
-rwxr-xr-xrootdir/etc/init.qcom.rc11
2 files changed, 9 insertions, 4 deletions
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 8daf8c7..811edad 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -40,5 +40,5 @@
/dev/block/bootdevice/by-name/keymasterbak /keymasterbak emmc defaults defaults
/dev/block/bootdevice/by-name/cmnlibbak /cmnlibbak emmc defaults defaults
-/devices/soc/74a4900.sdhci/mmc_host* auto auto nosuid,nodev wait,encryptable=/dev/block/bootdevice/by-name/encrypt,voldmanaged=external_SD:auto
+/devices/soc/74a4900.sdhci/mmc_host* auto auto defaults voldmanaged=sdcard1:auto,encryptable=/dev/block/bootdevice/by-name/encrypt
/devices/soc/6a00000.ssusb/6a00000.dwc3/xhci-hcd.0.auto/usb* auto auto defaults voldmanaged=usb:auto
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 8cf02f4..e40b551 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -375,6 +375,10 @@ on post-fs-data
mkdir /data/misc/port_bridge 0770 radio radio
chmod 0770 /data/misc/port_bridge
+ # Create netmgr log dir
+ mkdir /data/misc/netmgr 0770 radio radio
+ chmod 0770 /data/misc/netmgr
+
# Create the directories used by CnE subsystem
mkdir /data/connectivity 0771 system system
chown system system /data/connectivity
@@ -488,9 +492,10 @@ on post-fs-data
chown radio radio /data/misc/radio/copy_complete
chmod 0660 /data/misc/radio/copy_complete
- # lgvrhid
- mkdir /data/lgvrhid 0755 root root
- chmod 0660 /sys/bus/i2c/drivers/anx7418/6-0028/sbu2
+ # copy prebuilt qcril.db files always
+ copy /system/vendor/qcril.db /data/misc/radio/qcril_prebuilt.db
+ chown radio radio /data/misc/radio/qcril_prebuilt.db
+ chmod 0660 /data/misc/radio/qcril_prebuilt.db
# File flags for prebuilt ril db file
write /data/misc/radio/prebuilt_db_support 1