diff options
| author | Marcin Maj | 2025-12-04 00:43:41 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-12-05 09:26:59 +0000 |
| commit | 3a10dd596760ecebe5d8a5f3804bfe1d13f952ae (patch) | |
| tree | c8dc1a57c215feae538545d5e9ee5aaac2b94a62 | |
| parent | cc57e155a60891631c5040b9c4a3a2c0d1dbf38f (diff) | |
| download | openwrt-3a10dd596760ecebe5d8a5f3804bfe1d13f952ae.tar.gz | |
ath79: fix platform check image mikrotik nor
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>
| -rw-r--r-- | target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh b/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh index 629e7fd9b8..67e8d77175 100644 --- a/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh +++ b/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh @@ -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%%.*}" |