From 2a17be346d3630ccef509ce2358931b743b7c3bb Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Wed, 1 Apr 2015 15:07:49 -0700 Subject: deb: misc SELinux changes. * Move binaries to /system/bin and stop using /system/bin/sh * Remove init.qcom.class_main.sh . It doesn't exist. * Use domain transitions based on the file label instead of seclabel statements. Change-Id: I9df57a84cb4fcb59eebc9f61c44f01a8f585605c --- device.mk | 4 ---- init.deb.rc | 9 +++------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/device.mk b/device.mk index 224ac77..42bbaa8 100644 --- a/device.mk +++ b/device.mk @@ -34,10 +34,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ persist.radio.apm_sim_not_pwdn=1 -#Stop rild if non 3G SKU -PRODUCT_PACKAGES += \ - init.qcom.class_main.sh - PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ rild.libpath=/system/lib/libril-qc-qmi-1.so diff --git a/init.deb.rc b/init.deb.rc index 65cf477..f30722e 100644 --- a/init.deb.rc +++ b/init.deb.rc @@ -281,11 +281,10 @@ service rmt_storage /system/bin/rmt_storage user root group system -service hciattach /system/bin/sh /system/etc/init.flo.bt.sh +service hciattach /system/bin/init.flo.bt.sh class late_start user bluetooth group qcom_oncrpc bluetooth net_bt_admin system net_bt_stack - seclabel u:r:bluetooth_loader:s0 disabled oneshot @@ -306,10 +305,9 @@ service qmuxd /system/bin/qmuxd user radio group radio audio bluetooth gps net_bt_stack -service ks_checker /system/bin/sh /system/etc/kickstart_checker.sh +service ks_checker /system/bin/kickstart_checker.sh class core group system - seclabel u:r:kickstart:s0 oneshot service kickstart /system/bin/qcks -i /firmware/image/ -r /data/tombstones/mdm/ @@ -434,11 +432,10 @@ service qcamerasvr /system/bin/mm-qcamera-daemon user camera group camera system inet input -service wcnss_init /system/bin/sh /system/etc/init.flo.wifi.sh +service wcnss_init /system/bin/init.flo.wifi.sh class late_start user system group system wifi - seclabel u:r:conn_init:s0 oneshot service bdAddrLoader /system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x -- cgit v1.2.3