domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-files: drop fwtool_pre_upgrade

Browse Source 
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 5e1b4c57de)
This commit is contained in:
John Crispin
2018-07-30 17:42:39 +02:00
parent fe90d14880
commit 6a27c2f4b1
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/base-files/files/lib/upgrade/fwtool.sh
View File

@@ -1,7 +1,3 @@
fwtool_pre_upgrade() {
fwtool -q -i /dev/null "$1"
}
fwtool_check_image() { fwtool_check_image() {
[ $# -gt 1 ] && return 1 [ $# -gt 1 ] && return 1

3
package/base-files/files/sbin/sysupgrade
View File

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