aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hewitt <joey@joeyhewitt.com>2014-09-07 16:54:58 -0600
committerChirayu Desai <cdesai@cyanogenmod.org>2014-09-15 13:49:26 +0530
commit388f8b6be20e2843b4a0a404ca9a33bffcf3ac3b (patch)
tree04497ed228537a45f87e6475b94e3e56896977b8
parent0fcd4ecdc899c379dd209e01b47d2b7b53ae35ae (diff)
init: fixes for encrypted devices
Postpone some /data setup until post-fs-data, so it applies to decrypted mounts. Also enable the sensors service, still in class main, so that it's running for both the decryption screen (if enabled) and final boot state. Fixes CYAN-4682 (reported for rhine). Change-Id: Idc8c84b0fb5cbe2db1f202cd3bc6d84b589eb70e
-rw-r--r--rootdir/init.qcom.rc26
1 files changed, 12 insertions, 14 deletions
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 02100f2..00ac561 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -227,23 +227,10 @@ on boot
# an ack packet comes out of order
write /proc/sys/net/netfilter/nf_conntrack_tcp_be_liberal 1
- # NFC local data and nfcee xml storage
- mkdir /data/nfc 0770 nfc nfc
- mkdir /data/nfc/param 0770 nfc nfc
-
# Set the console loglevel to < KERN_INFO
# Set the default message loglevel to KERN_INFO
write /proc/sys/kernel/printk "6 6 1 7"
- # QCOM Sensors
- mkdir /data/system 0775 system system
- mkdir /data/system/sensors 0775 system system
- mkdir /data/misc/sensors 0775 system system
- write /data/system/sensors/settings 1
- chmod 664 /data/system/sensors/settings
- chown system /data/system/sensors/settings
- start sensors
-
chown system /sys/devices/virtual/timed_output/vibrator/vtg_level
on post-fs
@@ -292,6 +279,18 @@ on post-fs-data
chmod 0664 /sys/devices/platform/msm_sdcc.3/polling
chmod 0664 /sys/devices/platform/msm_sdcc.4/polling
+ # NFC local data and nfcee xml storage
+ mkdir /data/nfc 0770 nfc nfc
+ mkdir /data/nfc/param 0770 nfc nfc
+
+ # QCOM Sensors
+ mkdir /data/system 0775 system system
+ mkdir /data/system/sensors 0775 system system
+ mkdir /data/misc/sensors 0775 system system
+ write /data/system/sensors/settings 1
+ chmod 664 /data/system/sensors/settings
+ chown system /data/system/sensors/settings
+
# Chown polling nodes as needed from UI running on system server
chown system system /sys/devices/platform/msm_sdcc.1/polling
chown system system /sys/devices/platform/msm_sdcc.2/polling
@@ -588,7 +587,6 @@ service sensors /system/bin/sensors.qcom
class main
user root
group root
- disabled
service time_daemon /system/bin/time_daemon
class late_start