From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Tue, 6 Mar 2018 09:50:19 +0000 (+0800)
Subject: Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
X-Git-Tag: android-x86-8.1-r1~36
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=d3fa0c08f37451a4974ea0da173361185ef1a0b5;hp=-c

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

d3fa0c08f37451a4974ea0da173361185ef1a0b5
diff --combined init.x86.rc
index e0fe113,8aebe59..f718b79
--- a/init.x86.rc
+++ b/init.x86.rc
@@@ -15,7 -15,7 +15,7 @@@ on f
      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
@@@ -45,9 -45,8 +45,9 @@@ on boo
      # 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
@@@ -57,12 -56,12 +57,13 @@@
      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 -b all -v threadtime -f /data/log.txt
      class debug
@@@ -71,24 -70,29 +72,29 @@@ service btattach /system/bin/btattac
      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
@@@ -98,10 -102,10 +104,10 @@@
  
  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