Просмотр исходного кода

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 <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/21034
Signed-off-by: Robert Marko <[email protected]>
Marcin Maj 3 недель назад
Родитель
Сommit
3a10dd5967
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh

+ 1 - 1
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%%.*}"