diff options
| author | John Crispin <john@phrozen.org> | 2018-07-30 17:42:39 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-08-08 15:42:06 +0200 |
| commit | 6a27c2f4b1a4a65210396336d2226f5b3f482374 (patch) | |
| tree | a3f6ad637978f4c1fd4297c07a9433a93bb5f944 | |
| parent | fe90d14880ad80e5cbc0eba036f8f9f83fa77396 (diff) | |
| download | upstream-6a27c2f4b1a4a65210396336d2226f5b3f482374.tar.gz upstream-6a27c2f4b1a4a65210396336d2226f5b3f482374.tar.bz2 upstream-6a27c2f4b1a4a65210396336d2226f5b3f482374.zip | |
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)
| -rw-r--r-- | package/base-files/files/lib/upgrade/fwtool.sh | 4 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/sysupgrade | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/package/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh index 49f02b7bd9..aa2ac79d13 100644 --- 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 482be068d9..a378b02950 100755 --- 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." |