X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=blobdiff_plain;f=init.x86.rc;h=bdb05e2a89a2dad87f49bf46209e7f4b33d5733a;hp=acee8533206233b04ab6991debde43b17016c5a7;hb=6d50976748ebc61030a91582a885b38283a2e2d2;hpb=5e6912c6c6be887e3a30755a8a4d6b8a7f863943

diff --git a/init.x86.rc b/init.x86.rc
index acee853..bdb05e2 100644
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -15,7 +15,7 @@ on fs
     mount_all /fstab.${ro.hardware}
 
 on post-fs
-    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
+    exec u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
 
 on post-fs-data
     mkdir /data/misc/wifi 0770 wifi wifi
@@ -23,6 +23,7 @@ on post-fs-data
     mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
     mkdir /data/misc/dhcp 0770 dhcp dhcp
     mkdir /data/system 0775 system system
+    chown wifi wifi /data/misc/wifi/wpa_supplicant.conf
 
     # Set indication (checked by vold) that we have finished this action
     setprop vold.post_fs_data_done 1
@@ -45,8 +46,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,32 +58,44 @@ 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
+    seclabel u:r:zygote:s0
 
-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
     class main
     disabled
     oneshot
+    seclabel u:r:bluetooth:s0
 
 service rtk_hciattach /vendor/bin/rtk_hciattach -n -s 115200 /dev/rtk_h5 rtk_h5
     class main
     disabled
     oneshot
+    seclabel u:r:bluetooth:s0
 
 service wacom-input /system/bin/wacom-input
     disabled
     oneshot
+    seclabel u:r:inputflinger:s0
 
 service tablet-mode /system/bin/tablet-mode
     disabled
     oneshot
+    seclabel u:r:inputflinger:s0
+
+service ctrl-alt-del /system/bin/input keyevent --longpress POWER
+    disabled
+    oneshot
+    keycodes 97 100 111
+    seclabel u:r:init:s0
 
 on property:system_init.startsurfaceflinger=0
     # disable cursor blinking
@@ -91,20 +105,16 @@ 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 u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh bootcomplete
 
 on property:net.dns1=*
-    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh netconsole
+    exec u:r:init:s0 -- /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
-    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