diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-09-05 13:29:37 +0200 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2019-09-05 20:42:08 +0200 |
| commit | 45600124fcbd14ece6e289cb59b318ea44c598fe (patch) | |
| tree | 3c5c81db8086683f4a0db96a91ff9ea6b05c806c | |
| parent | 4c060228cb7756bada6ded3fe9d23a48b9a797ee (diff) | |
| download | upstream-45600124fcbd14ece6e289cb59b318ea44c598fe.tar.gz upstream-45600124fcbd14ece6e289cb59b318ea44c598fe.tar.bz2 upstream-45600124fcbd14ece6e289cb59b318ea44c598fe.zip | |
base-files: use get_mac_binary() in mtd_get_mac_binary_ubi()
The actual retrieval of the MAC address in mtd_get_mac_binary_ubi()
is the same as in get_mac_binary(). Thus, use the latter function
in the former to reduce duplicate code.
This will also allow to benefit from the enhanced path check there
and bring mtd_get_mac_binary_ubi() more in line with the similar
mtd_get_mac_binary().
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
| -rw-r--r-- | package/base-files/files/lib/functions/system.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/package/base-files/files/lib/functions/system.sh b/package/base-files/files/lib/functions/system.sh index 2a43d18d33..5084c0052b 100644 --- a/package/base-files/files/lib/functions/system.sh +++ b/package/base-files/files/lib/functions/system.sh @@ -79,12 +79,7 @@ mtd_get_mac_binary_ubi() { local ubidev=$(nand_find_ubi $CI_UBIPART) local part=$(nand_find_volume $ubidev $1) - if [ -z "$part" ]; then - echo "mtd_get_mac_binary: ubi volume $mtdname not found!" >&2 - return - fi - - hexdump -v -n 6 -s $offset -e '5/1 "%02x:" 1/1 "%02x"' /dev/$part 2>/dev/null + get_mac_binary "/dev/$part" "$offset" } mtd_get_part_size() { |