init: move the init.sh execution to the post-fs stage

[android-x86/device-generic-common.git] / init.x86.rc

diff --git a/init.x86.rc b/init.x86.rc
index 6ed2264..42ae1c3 100644 (file)
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -2,8 +2,6 @@ import /init.bluetooth.rc
 import /init.superuser.rc
 
 on early-init
-    mount debugfs debugfs /sys/kernel/debug
-    chmod 755 /sys/kernel/debug
     write /proc/sys/kernel/ctrl-alt-del 1
 
     write /sys/module/xt_qtaguid/parameters/ctrl_write_limited N
@@ -19,11 +17,12 @@ on init
     # Backward compatibility
     symlink system/lib /lib
 
-    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
-
 on fs
     mount_all /fstab.${ro.hardware}
 
+on post-fs
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
+
 on post-fs-data
     sysclktz 1
 
@@ -36,9 +35,6 @@ on post-fs-data
     # Set indication (checked by vold) that we have finished this action
     setprop vold.post_fs_data_done 1
 
-on early-boot
-    readprops /x86.prop
-
 on boot
     setprop ro.radio.use-ppp yes
     setprop ro.radio.noril no
@@ -101,6 +97,11 @@ service powerbtnd /system/bin/powerbtnd
 service logcat /system/bin/logcat -v threadtime -f /data/log.txt
     class debug
 
+service btattach /system/bin/btattach -Pbcm
+    class main
+    disabled
+    oneshot
+
 service wacom-input /system/bin/wacom-input
     disabled
     oneshot
@@ -135,6 +136,7 @@ on property:debug.logcat=1
     class_start debug
 
 on property:persist.sys.nativebridge=1
+    mkdir /data/arm 0775 system system
     start nativebridge
 
 on property:persist.sys.nativebridge=0