From 8ee95e7a676c2a89e32204317de8b0e9a8ffc6a7 Mon Sep 17 00:00:00 2001 From: Tomas Zak Date: Wed, 14 Feb 2024 17:58:25 +0100 Subject: [PATCH] firmware-updater: change factory image update Change automatic update of factory image from major versions to subversions. --- utils/firmware-updater/Makefile | 2 +- utils/firmware-updater/files/firmware-updater.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/firmware-updater/Makefile b/utils/firmware-updater/Makefile index f40965392..d4ed3e2f2 100644 --- a/utils/firmware-updater/Makefile +++ b/utils/firmware-updater/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firmware-updater -PKG_VERSION:=1.0 +PKG_VERSION:=1.1 PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=CZ.NIC diff --git a/utils/firmware-updater/files/firmware-updater.sh b/utils/firmware-updater/files/firmware-updater.sh index c1439b41a..71bebf27e 100755 --- a/utils/firmware-updater/files/firmware-updater.sh +++ b/utils/firmware-updater/files/firmware-updater.sh @@ -6,5 +6,5 @@ [ ! -x /usr/bin/omnia-mcutool ] || \ omnia-mcutool --upgrade [ "0$(uci get pkglists.firmware_update.factory)" -ne 1 ] || \ - [ "$(schnapps factory-version | cut -f 1 -d .)" -eq "$(cut -f 1 -d . /etc/turris-version)" ] || \ - schnapps update-factory > /dev/null 2>&1 + [ "$(schnapps factory-version | cut -f 1,2 -d .)" == "$(cut -f 1,2 -d . /etc/turris-version)" ] || \ + schnapps update-factory > /dev/null 2>&1