base-files: drop fwtool_pre_upgrade

[openwrt/staging/chunkeey.git] / package / base-files / files / lib / upgrade / fwtool.sh

diff --git a/package/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh
index 984c173097e3882e791ecdc5008a46943a128f45..aa2ac79d13790200163c284e04d961d185b21463 100644 (file)
--- a/package/base-files/files/lib/upgrade/fwtool.sh
+++ b/package/base-files/files/lib/upgrade/fwtool.sh
@@ -1,7 +1,3 @@
-fwtool_pre_upgrade() {
-       fwtool -q -i /dev/null "$1"
-}
-
 fwtool_check_image() {
        [ $# -gt 1 ] && return 1
 
@@ -9,6 +5,9 @@ fwtool_check_image() {
 
        if ! fwtool -q -i /tmp/sysupgrade.meta "$1"; then
                echo "Image metadata not found"
+               [ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && {
+                       echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"
+               }
                [ "$REQUIRE_IMAGE_METADATA" = 1 ] && return 1
                return 0
        fi