diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-09-05 13:29:37 +0200 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2019-09-29 11:32:05 +0200 |
| commit | 28d3afc8d67231c2ad7adbde3e4b1179d0648c0e (patch) | |
| tree | c6b9673ae8913fea09d1b955684f3e75e2ffe997 | |
| parent | 39ae849d0d23409ba6557df9055b306cf29df475 (diff) | |
| download | upstream-28d3afc8d67231c2ad7adbde3e4b1179d0648c0e.tar.gz upstream-28d3afc8d67231c2ad7adbde3e4b1179d0648c0e.tar.bz2 upstream-28d3afc8d67231c2ad7adbde3e4b1179d0648c0e.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>
(cherry picked from commit 45600124fcbd14ece6e289cb59b318ea44c598fe)
| -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 9b9d03df7b..dceb66a851 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() { |