[PATCH] base-files: read all 5 bytes in get_magic_fat32() at once

Adrian Schmutzler freifunk at adrianschmutzler.de
Mon Jan 4 06:10:54 EST 2021


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

Suggested-by: Paul Spooren <mail at aparcar.org>
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 package/base-files/Makefile                    | 2 +-
 package/base-files/files/lib/upgrade/common.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 c28bae48a1..9b17e2ac5d 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -134,7 +134,7 @@ get_magic_vfat() {
 }
 
 get_magic_fat32() {
-	(get_image "$@" | dd bs=1 count=5 skip=82) 2>/dev/null
+	(get_image "$@" | dd iflag=skip_bytes bs=5 count=1 skip=82) 2>/dev/null
 }
 
 part_magic_efi() {
-- 
2.20.1




More information about the openwrt-devel mailing list