Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

base-files: rework mtd_get_mac_text()

Browse source 
It's necessary to be able to specify the length
for MAC addresses that are stored in flash, for example,
in a case where it is stored without any delimiter.

Let both offset and length have default values.

Add a sanity check related to partition size.

Also, clean up syntax and unnecessary lines.

Signed-off-by: Michael Pratt <mcpratt@pm.me>
This commit is contained in:
Michael Pratt 2022-12-10 06:34:54 -05:00 committed by Hauke Mehrtens
parent 766de7013f
commit 1e3a8f454e
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
package/base-files/files/lib/functions/system.sh
View file

@ -141,10 +141,10 @@ mtd_get_mac_uci_config_ubi() {
} }
mtd_get_mac_text() { mtd_get_mac_text() {
local mtdname=$1 local mtdname="$1"
local offset=$(($2)) local offset=$((${2:-0}))
local length="${3:-17}"
local part local part
local mac_dirty
part=$(find_mtd_part "$mtdname") part=$(find_mtd_part "$mtdname")
if [ -z "$part" ]; then if [ -z "$part" ]; then
@ -152,15 +152,9 @@ mtd_get_mac_text() {
return return
fi fi
if [ -z "$offset" ]; then [ $((offset + length)) -le $(mtd_get_part_size "$mtdname") ] || return
echo "mtd_get_mac_text: offset missing!" >&2
return
fi
mac_dirty=$(dd if="$part" bs=1 skip="$offset" count=17 2>/dev/null) macaddr_canonicalize $(dd bs=1 if="$part" skip="$offset" count="$length" 2>/dev/null)
# "canonicalize" mac
[ -n "$mac_dirty" ] && macaddr_canonicalize "$mac_dirty"
} }
mtd_get_mac_binary() { mtd_get_mac_binary() {