From c8d4c0eb52180abb7876816eb86100f90a67e3a0 Mon Sep 17 00:00:00 2001 From: Arian Date: Wed, 12 Feb 2020 17:33:37 +0100 Subject: shinano-common: Move macaddrsetup service declaration to its respective init.rc Change-Id: Ic434c18314838f845bcdca5e029a127db0500070 --- rootdir/etc/init.qcom.rc | 9 +++------ system_prop.mk | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 3992976..9447ff1 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -321,6 +321,9 @@ on post-fs-data # Create directory used by bluetooth subsystem mkdir /data/vendor/bluetooth 2770 bluetooth bluetooth + # Set owner of macaddr node + chown system system /sys/devices/platform/bcmdhd_wlan/macaddr + # Provide the access to hostapd.conf only to root and group chmod 0660 /data/hostapd/hostapd.conf @@ -368,12 +371,6 @@ service qmuxd /vendor/bin/qmuxd user root group radio audio bluetooth gps nfc diag wakelock oem_2950 -# Wi-Fi and BT MAC addresses -service macaddrsetup /vendor/bin/macaddrsetup /sys/devices/platform/bcmdhd_wlan/macaddr - class late_start - user root - oneshot - service netmgrd /vendor/bin/netmgrd class late_start user root diff --git a/system_prop.mk b/system_prop.mk index 0479e8d..bf992bf 100644 --- a/system_prop.mk +++ b/system_prop.mk @@ -52,6 +52,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.bt.bdaddr_path="/data/etc/bluetooth_bdaddr" \ ro.rfkilldisabled=1 +# macaddrsetup +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.wifi.addr_path="/sys/devices/platform/bcmdhd_wlan/macaddr" + # Semc PRODUCT_PROPERTY_OVERRIDES += \ ro.semc.version.sw_revision=23.5.A.1.291 \ -- cgit v1.2.3