Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

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

diff --git a/init.x86.rc b/init.x86.rc
index e0b2df9..e0fe113 100644 (file)
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -45,8 +45,9 @@ on boot
     # workaround for h.265 slowness
     setprop sys.media.vdec.drop 0
 
-service wpa_supplicant /system/bin/wpa_supplicant -c/data/misc/wifi/wpa_supplicant.conf \
-    -iwlan0 -Dnl80211 \
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant -dd \
+    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+    -I/system/etc/wifi/wpa_supplicant_overlay.conf \
     -O/data/misc/wifi/sockets \
     -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
     #   we will start as root and wpa_supplicant will switch to user wifi
@@ -56,13 +57,14 @@ service wpa_supplicant /system/bin/wpa_supplicant -c/data/misc/wifi/wpa_supplica
     class main
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
+    oneshot
 
 service nativebridge /system/bin/enable_nativebridge
     class main
     disabled
     oneshot
 
-service logcat /system/bin/logcat -v threadtime -f /data/log.txt
+service logcat /system/bin/logcat -b all -v threadtime -f /data/log.txt
     class debug
 
 service btattach /system/bin/btattach
@@ -83,6 +85,11 @@ service tablet-mode /system/bin/tablet-mode
     disabled
     oneshot
 
+service ctrl-alt-del /system/bin/input keyevent --longpress POWER
+    disabled
+    oneshot
+    keycodes 97 100 111
+
 on property:system_init.startsurfaceflinger=0
     # disable cursor blinking
     write /dev/tty0 "\e[?17;0;0c"
@@ -100,7 +107,6 @@ 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