init.x86.rc: use the marshmallow built-in command exec

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

diff --git a/init.x86.rc b/init.x86.rc
index 9001841..c210752 100644 (file)
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -1,3 +1,4 @@
+import /init.bluetooth.rc
 import /init.superuser.rc
 
 on early-init
@@ -8,7 +9,7 @@ on early-init
     write /sys/module/xt_qtaguid/parameters/ctrl_write_limited N
 
     export force_s3tc_enable true
-#   export EGL_LOG_LEVEL info
+    export EGL_LOG_LEVEL info
 #   export EGL_DRIVERS egl_dri2
 
 on init
@@ -43,7 +44,7 @@ on init
     setprop ro.product.manufacturer $[/sys/class/dmi/id/sys_vendor]
     setprop ro.product.model $[/sys/class/dmi/id/product_name]
 
-    exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
 
 on fs
     mount_all /fstab.${ro.hardware}
@@ -86,7 +87,6 @@ on boot
     setprop sys.media.vdec.drop 0
 
 service wpa_supplicant /system/bin/wpa_supplicant -c/data/misc/wifi/wpa_supplicant.conf \
-    -ddddd \
     -iwlan0 -Dnl80211 \
     -O/data/misc/wifi/sockets \
     -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
@@ -118,8 +118,9 @@ service iprenew_eth0 /system/bin/dhcpcd -n
     disabled
     oneshot
 
-service enable_houdini /system/bin/enable_houdini
+service nativebridge /system/bin/enable_nativebridge
     class main
+    disabled
     oneshot
 
 service powerbtnd /system/bin/powerbtnd
@@ -170,10 +171,22 @@ on property:system_init.startsurfaceflinger=0
 
 on property:sys.boot_completed=1
     write /proc/sys/kernel/ctrl-alt-del 0
-    exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh bootcomplete
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh bootcomplete
+
+on property:init.svc.bluetoothd=running
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh hci
+
+on property:init.svc.bluetoothd=stopped
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh hci
 
 on property:net.dns1=*
-    exec /system/bin/logwrapper /system/bin/sh /system/etc/init.sh netconsole
+    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh netconsole
 
 on property:debug.logcat=1
     class_start debug
+
+on property:persist.sys.nativebridge=1
+    start nativebridge
+
+on property:persist.sys.nativebridge=0
+    stop nativebridge