Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

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

diff --git a/init.x86.rc b/init.x86.rc
index 46ede7d..738d98f 100644 (file)
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -10,8 +10,6 @@ on early-init
 #   export EGL_DRIVERS egl_dri2
 
 on init
-    symlink /sdcard /mnt/sdcard
-    symlink /sdcard /storage/sdcard0
 
 on fs
     mount_all /fstab.${ro.hardware}
@@ -35,6 +33,8 @@ on boot
     setprop status.battery.level 5
     setprop status.battery.level_raw  50
     setprop status.battery.level_scale 9
+    setprop wifi.interface "wlan0"
+    setprop wlan.driver.status "ok"
 
     # merge from system.prop
     setprop ro.config.sync yes
@@ -59,44 +59,11 @@ service wpa_supplicant /system/bin/wpa_supplicant -c/data/misc/wifi/wpa_supplica
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
 
-service dhcpcd_wlan0 /system/bin/dhcpcd -aABDKL
-    class main
-    disabled
-    oneshot
-
-service iprenew_wlan0 /system/bin/dhcpcd -n
-    class main
-    disabled
-    oneshot
-
-service dhcpcd_eth0 /system/bin/dhcpcd -ABDKL
-    class main
-    disabled
-    oneshot
-
-service iprenew_eth0 /system/bin/dhcpcd -n
-    class main
-    disabled
-    oneshot
-
-service dhcpcd_bt-pan /system/bin/dhcpcd -BKLG
-    class late_start
-    disabled
-    oneshot
-
-service iprenew_bt-pan /system/bin/dhcpcd -n
-    class late_start
-    disabled
-    oneshot
-
 service nativebridge /system/bin/enable_nativebridge
     class main
     disabled
     oneshot
 
-service powerbtnd /system/bin/powerbtnd
-    class late_start
-
 service logcat /system/bin/logcat -v threadtime -f /data/log.txt
     class debug
 
@@ -105,6 +72,11 @@ service btattach /system/bin/btattach
     disabled
     oneshot
 
+service rtk_hciattach /vendor/bin/rtk_hciattach -n -s 115200 /dev/rtk_h5 rtk_h5
+    class main
+    disabled
+    oneshot
+
 service wacom-input /system/bin/wacom-input
     disabled
     oneshot
@@ -113,9 +85,6 @@ service tablet-mode /system/bin/tablet-mode
     disabled
     oneshot
 
-on property:init.svc.wpa_supplicant=stopped
-    stop dhcpcd
-
 on property:system_init.startsurfaceflinger=0
     # disable cursor blinking
     write /dev/tty0 "\e[?17;0;0c"
@@ -133,11 +102,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
     stop nativebridge
-
-on property:debug.egl.hw=0
-    setprop ro.kernel.qemu 1