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=467c3b809d7c75a8f94602bddc9e7e2f7b3cb4a7;hb=77c137807539101e4abdcad7177eaef5c41d0669;hpb=3319a7ca9ec944b067cead2f3a822e7587a1d34e

diff --git a/init.x86.rc b/init.x86.rc
index 467c3b8..bdb05e2 100644
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -1,9 +1,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
@@ -13,39 +10,26 @@ on early-init
 #   export EGL_DRIVERS egl_dri2
 
 on init
-    symlink /sdcard /mnt/sdcard
-    symlink /sdcard /storage/sdcard0
-
-    # Backward compatibility
-    symlink system/lib /lib
-
-    # device information
-    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
 
 on fs
     mount_all /fstab.${ro.hardware}
 
-on post-fs-data
-    sysclktz 1
+on post-fs
+    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
     mkdir /data/misc/wifi/sockets 0770 wifi wifi
     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
 
-on early-boot
-    readprops /x86.prop
-
 on boot
     setprop ro.radio.use-ppp yes
-    setprop ro.radio.noril no
     setprop status.battery.state Slow
     setprop status.battery.level 5
     setprop status.battery.level_raw  50
@@ -62,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
@@ -73,48 +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
-
-service dhcpcd_wlan0 /system/bin/dhcpcd -aABDKL
-    class main
-    disabled
     oneshot
 
-service iprenew_wlan0 /system/bin/dhcpcd -n
+service nativebridge /system/bin/enable_nativebridge
     class main
     disabled
     oneshot
+    seclabel u:r:zygote:s0
 
-service dhcpcd_eth0 /system/bin/dhcpcd -ABDKL
-    class main
-    disabled
-    oneshot
+service logcat /system/bin/logcat -b all -v threadtime -f /data/log.txt
+    class debug
 
-service iprenew_eth0 /system/bin/dhcpcd -n
+service btattach /system/bin/btattach
     class main
     disabled
     oneshot
+    seclabel u:r:bluetooth:s0
 
-service nativebridge /system/bin/enable_nativebridge
+service rtk_hciattach /vendor/bin/rtk_hciattach -n -s 115200 /dev/rtk_h5 rtk_h5
     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
+    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
 
-on property:init.svc.wpa_supplicant=stopped
-    stop dhcpcd
+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
@@ -124,16 +105,10 @@ 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
-
-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
+    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