From 8e9a6525e3b152ffbf7e47794ece840e835b68ec Mon Sep 17 00:00:00 2001 From: Vachounet Date: Tue, 29 Aug 2017 12:12:21 +0200 Subject: [PATCH] potter: remove seclabels Change-Id: Ida56c463268e237d76da6b91a0d570b2e475562c --- rootdir/etc/init.mmi.rc | 6 --- rootdir/etc/init.qcom.rc | 73 +++++++------------------------------ rootdir/etc/ueventd.qcom.rc | 6 +-- 3 files changed, 17 insertions(+), 68 deletions(-) diff --git a/rootdir/etc/init.mmi.rc b/rootdir/etc/init.mmi.rc index fb0062b..3982d41 100644 --- a/rootdir/etc/init.mmi.rc +++ b/rootdir/etc/init.mmi.rc @@ -290,7 +290,6 @@ on property:ro.boot.dualsim=false setprop ro.telephony.default_network 10 service adspd /system/bin/adspd - seclabel u:r:adspd:s0 class main socket adspdsock stream 0660 system audio user audio @@ -311,25 +310,21 @@ service fingerprintd /system/bin/fingerprintd group input service mmi-boot-sh /system/bin/init.mmi.boot.sh - seclabel u:r:mmi_boot:s0 class core user root oneshot service mmi-laser-sh /system/bin/init.mmi.laser.sh - seclabel u:r:mmi_laser:s0 class core user root oneshot service mmi-touch-sh /system/bin/init.mmi.touch.sh - seclabel u:r:mmi_touch:s0 class core user root oneshot service oem-hw-sh /system/bin/init.oem.hw.sh - seclabel u:r:oem-hw-sh:s0 class core user root oneshot @@ -340,7 +335,6 @@ service motosh /system/bin/motosh boot user compass group compass misc input oneshot - seclabel u:r:sensor_hub:s0 service thermal-com /system/vendor/bin/thermal-engine --minimode class main diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 3eeb0c8..b069c29 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -35,9 +35,6 @@ on early-init symlink /data/tombstones /tombstones mkdir /dsp 0771 media media - # Wifi firmware reload path - chown wifi wifi /sys/module/wlan/parameters/fwpath - on fs wait /dev/block/platform/soc/${ro.boot.bootdevice} symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice @@ -58,7 +55,7 @@ on fs on init # Symbols required for motorola blobs - export LD_SHIM_LIBS /system/vendor/lib/libmot_gpu_mapper.so|libshim_camera.so:/system/vendor/lib/lib-imsvt.so|libshim_ims.so:/system/bin/adspd|libshim_adsp.so:/system/lib/libandroid.so|libshim_ril.so:/system/vendor/lib/libizat_core.so:libshims_get_process_name.so + export LD_SHIM_LIBS /system/vendor/lib/libmot_gpu_mapper.so|libshim_camera.so:/system/vendor/lib/lib-imsvt.so|libshim_ims.so:/system/bin/adspd|libshim_adsp.so:/system/vendor/lib/libizat_core.so:libshims_get_process_name.so:/system/vendor/lib/libril-qc-qmi-1.so|rild_socket.so write /sys/module/qpnp_rtc/parameters/poweron_alarm 1 @@ -254,6 +251,12 @@ on boot chown system system /dev/cpuset/camera-daemon/tasks chmod 0664 /dev/cpuset/camera-daemon/tasks + # Wifi firmware reload path + chown wifi wifi /sys/module/wlan/parameters/fwpath + + # Mark wifi driver as unloaded - "ok" indicates loaded + setprop wlan.driver.status not_ok + # msm specific files that need to be created on /data on post-fs-data mkdir /tombstones/modem 0771 system system @@ -358,9 +361,6 @@ on post-fs-data mkdir /data/fota 0771 chown system system /data/fota - #Create directory for hostapd - mkdir /data/hostapd 0770 system wifi - # Create /data/time folder for time-services mkdir /data/time/ 0700 system system @@ -413,7 +413,6 @@ on post-fs-data service charger /charger class charger group log - seclabel u:r:healthd:s0 # Allow usb charging to be disabled peristently on property:persist.usb.chgdisabled=1 @@ -469,10 +468,6 @@ service qcamerasvr /system/bin/mm-qcamera-daemon group camera system inet input graphics writepid /dev/cpuset/system-background/tasks -service cnd /system/bin/cnd - class main - socket cnd stream 660 root inet - service qseeproxydaemon /system/vendor/bin/qseeproxydaemon class late_start user system @@ -527,13 +522,6 @@ service imscmservice /system/bin/imscmservice on property:sys.ims.DATA_DAEMON_STATUS=1 start imscmservice -service imsdatadaemon /system/bin/imsdatadaemon - class main - user system - socket ims_datad stream 0660 system radio - group system wifi radio inet log diag - disabled - writepid /dev/cpuset/system-background/tasks on property:sys.ims.QMI_DAEMON_STATUS=1 start imsdatadaemon @@ -690,16 +678,12 @@ on property:sys.sysctl.tcp_adv_win_scale=* write /proc/sys/net/ipv4/tcp_adv_win_scale ${sys.sysctl.tcp_adv_win_scale} service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ - -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \ - -I/system/etc/wifi/p2p_supplicant_overlay.conf -N \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ -I/system/etc/wifi/wpa_supplicant_overlay.conf \ - -O/data/misc/wifi/sockets -puse_p2p_group_interface=1 -dd \ + -O/data/misc/wifi/sockets \ + -m/data/misc/wifi/p2p_supplicant.conf \ + -puse_p2p_group_interface=1p2p_device=1 \ -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 - # we will start as root and wpa_supplicant will switch to user wifi - # after setting up the capabilities required for WEXT - # user wifi - # group wifi inet keystore class main socket wpa_wlan0 dgram 660 wifi wifi disabled @@ -824,40 +808,11 @@ on property:ro.data.large_tcp_window_size=true # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB) write /proc/sys/net/ipv4/tcp_adv_win_scale 2 -service hostapd /system/bin/hostapd -dd /data/misc/wifi/hostapd.conf - class late_start - user root - group root - oneshot - disabled - -service ril-daemon /system/bin/rild - class main - socket rild stream 660 root radio - socket sap_uim_socket1 stream 660 bluetooth bluetooth - socket rild-debug stream 660 radio system - socket cutback stream 660 media radio - socket wpa_wlan0 dgram 660 wifi wifi - user root - group radio cache inet misc audio log diag net_raw wifi compass - writepid /dev/cpuset/system-background/tasks - service ril-daemon2 /vendor/bin/hw/rild -c 2 - class main - user root - group radio cache inet misc audio sdcard_r sdcard_rw diag log - -service ril-daemon3 /vendor/bin/hw/rild -c 3 - class main - user root - disabled - group radio cache inet misc audio sdcard_r sdcard_rw diag log - -service rild2-wrapper /system/bin/sh /system/etc/init.qcom.ril.sh - class late_start - user root - group root - oneshot + class main + user radio + group radio cache inet misc audio log readproc wakelock + capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW service ssr_setup /system/bin/ssr_setup oneshot diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc index eab6e0a..f97f99c 100644 --- a/rootdir/etc/ueventd.qcom.rc +++ b/rootdir/etc/ueventd.qcom.rc @@ -174,8 +174,8 @@ /dev/msm_preproc_ctl 0660 system audio /dev/msm_rtac 0660 system audio /dev/msm_voicememo 0660 system audio -/dev/smd3 0660 bluetooth net_bt_stack -/dev/smd2 0660 bluetooth net_bt_stack +/dev/smd3 0660 bluetooth bluetooth +/dev/smd2 0660 bluetooth bluetooth /dev/ttyHSL1 0660 system system /dev/ttyHS1 0660 system system /dev/mdm 0660 system radio @@ -348,4 +348,4 @@ /dev/isdbt 0660 mot_dtv mot_dtv #Egistec fingerprint -/dev/esfp0 0660 system system \ No newline at end of file +/dev/esfp0 0660 system system