base-files: drop fwtool_pre_upgrade

this feature has never worked, the fw image name was not passed and the -t
parameter was missing in the tool invocation. drop the feature.

Signed-off-by: John Crispin <john@phrozen.org>
(cherry picked from commit 5e1b4c57ded7898be5255aef594fa18ec206f0b2)

diff --git a/package/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh
index 49f02b7bd9ed735a43a487ea2d7d306a604be6c0..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
 

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 482be068d9d9be3d740989f03c54df01719e7a90..a378b029500ac5981d504889b0b3e6af3cf92a0d 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -137,7 +137,6 @@ add_overlayfiles() {
 
 # hooks
 sysupgrade_image_check="fwtool_check_image platform_check_image"
-sysupgrade_pre_upgrade="fwtool_pre_upgrade"
 
 if [ $SAVE_OVERLAY = 1 ]; then
        [ ! -d /overlay/upper/etc ] && {
@@ -264,8 +263,6 @@ else
        rm -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap
 fi
 
-run_hooks "" $sysupgrade_pre_upgrade
-
 install_bin /sbin/upgraded
 v "Commencing upgrade. Closing all shell sessions."