hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-12-06 12:44:00 -05:00
Code Issues Projects Releases Wiki Activity

ath79: fix platform check image mikrotik nor

Browse Source 
Every attempt to update a device with NOR flash
and RouterBOOT v6 resulted in the error:
“RouterBOOT 6 and earlier requires ELF-in-YAFFS image.”
The cause was that xargs did not fully remove whitespace,
so the condition "$bootentry" != "kernel" always evaluated to true.

Signed-off-by: Marcin Maj <marcinmajsc@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21034
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Marcin Maj 2025-12-04 01:43:41 +01:00 committed by Robert Marko
parent cc57e155a6
commit 3a10dd5967
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh
View File

@ -6,7 +6,7 @@ REQUIRE_IMAGE_METADATA=1
platform_check_image_mikrotik_nor() {
local bootfwver bootfwmajor
local bootentry="$(dd bs=10 skip=1 count=1 if="$1" 2>/dev/null | xargs -0)"
local bootentry="$(dd bs=10 skip=1 count=1 if="$1" 2>/dev/null | xargs)"
read -r bootfwver < /sys/firmware/mikrotik/hard_config/booter_version
bootfwmajor="${bootfwver%%.*}"