diff options
| author | Davide Garberi <dade.garberi@gmail.com> | 2019-05-17 19:16:39 +0200 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2019-05-17 20:14:39 +0200 |
| commit | 3a18052032c0b99e919ebbacad963d21d4e76542 (patch) | |
| tree | fcf44da3f52fb45053fc54ca626aefbdccae2be3 /rootdir | |
| parent | 91ed41211d2977c5af1f2c3116f01d2fd46a709c (diff) | |
msm8996-common: Update mac addresses paths
* Switch to /persist for bt_mac to make so that it's kept even after a factory reset
* Also update the path of wlan_mac.bin in wlan.sh to write to the real mount point instead of the bind one
Change-Id: I250358484a8c8a8ef7f01941eea798c11d6ac4e7
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/bin/init.bt.sh | 4 | ||||
| -rw-r--r-- | rootdir/bin/init.wlan.sh | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/rootdir/bin/init.bt.sh b/rootdir/bin/init.bt.sh index 52d7f8f..b3281fa 100644 --- a/rootdir/bin/init.bt.sh +++ b/rootdir/bin/init.bt.sh @@ -18,7 +18,7 @@ # Set the proper hardware based BT mac address proc_bt="/proc/mac_bt" -bt_mac_path="/data/vendor/bluetooth/bdaddr" +bt_mac_path="/mnt/vendor/persist/bluetooth/bt_mac" if [[ $(xxd -p $proc_bt) == "000000000000" ]] || [[ $(xxd -p $proc_bt) == "666666666666" ]] || [[ ! -f $proc_bt ]]; then ran1=$(xxd -l 1 -p /dev/urandom) ran2=$(xxd -l 1 -p /dev/urandom) @@ -32,6 +32,6 @@ else bt_mac=$(xxd -p $proc_bt | tr '[:lower:]' '[:upper:]' | sed 's/.\{2\}/&:/g' | sed 's/.$//'); fi; -if [[ ! -f $bt_mac_path ]] || [[ $(cat $bt_mac_path) == "" ]] || [[ $(cat $bt_mac_path) == "000000000000" ]] || [ $(cat $bt_mac_path) == "666666666666" ]]; then +if [[ ! -f $bt_mac_path ]] || [[ $(cat $bt_mac_path) == "" ]] || [[ $(cat $bt_mac_path) == "000000000000" ]] || [[ $(cat $bt_mac_path) == "666666666666" ]]; then echo $bt_mac > $bt_mac_path fi; diff --git a/rootdir/bin/init.wlan.sh b/rootdir/bin/init.wlan.sh index 4f3eb7b..78e5358 100644 --- a/rootdir/bin/init.wlan.sh +++ b/rootdir/bin/init.wlan.sh @@ -18,7 +18,8 @@ # Set the proper hardware based wlan mac proc_wifi="/proc/mac_wifi" -wifi_mac_persist=$(cat /persist/wlan_mac.bin | grep Intf0MacAddress | sed 's/Intf0MacAddress=//') +wifi_mac_path="/mnt/vendor/persist/wlan_mac.bin" +wifi_mac_persist=$(cat $wifi_mac_path | grep Intf0MacAddress | sed 's/Intf0MacAddress=//') if [[ $(xxd -p $proc_wifi) == "000000000000" ]] || [[ $(xxd -p $proc_wifi) == "555555555555" ]] || [[ ! -f $proc_wifi ]]; then ran1=$(xxd -l 1 -p /dev/urandom) ran2=$(xxd -l 1 -p /dev/urandom) @@ -31,7 +32,7 @@ if [[ $(xxd -p $proc_wifi) == "000000000000" ]] || [[ $(xxd -p $proc_wifi) == "5 else wifi_mac=$(xxd -p $proc_wifi | tr '[:lower:]' '[:upper:]'); fi; -if [[ ! -f /persist/wlan_mac.bin ]] || [[ $(echo $wifi_mac_persist) == "000000000000" ]] || [[ $(echo $wifi_mac_persist) == "555555555555" ]]; then - echo "Intf0MacAddress=$wifi_mac" > /persist/wlan_mac.bin - echo "END" >> /persist/wlan_mac.bin +if [[ ! -f $wifi_mac_path ]] || [[ $(echo $wifi_mac_persist) == "000000000000" ]] || [[ $(echo $wifi_mac_persist) == "555555555555" ]]; then + echo "Intf0MacAddress=$wifi_mac" > $wifi_mac_path + echo "END" >> $wifi_mac_path fi; |