From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Mon, 4 Jan 2021 00:28:44 +0000 (+0100)
Subject: base-files: read all 3 bytes in get_magic_vfat() at once
X-Git-Tag: v21.02.0-rc1~592
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=81655e1450a80276db32c8a8e10de73a256bc664;p=openwrt%2Fopenwrt.git

base-files: read all 3 bytes in get_magic_vfat() at once

While the speed improvement might be negligible, there is still no
reason to read individual bytes.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8d40eb0e49..f18f221129 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=245
+PKG_RELEASE:=246
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index e8a28f4138..c28bae48a1 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -130,7 +130,7 @@ get_magic_gpt() {
 }
 
 get_magic_vfat() {
-	(get_image "$@" | dd bs=1 count=3 skip=54) 2>/dev/null
+	(get_image "$@" | dd bs=3 count=1 skip=18) 2>/dev/null
 }
 
 get_magic_fat32() {