init.sh: fix virgl support of newer kernel

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

diff --git a/init.x86.rc b/init.x86.rc
index 6a6af41..bdb05e2 100644 (file)
--- 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
@@ -63,27 +64,38 @@ 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
@@ -93,10 +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
+    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