projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: sysupgrade: don't use $ARGV in platform_do_upgrade()
[openwrt/openwrt.git]
/
target
/
linux
/
ar71xx
/
base-files
/
lib
/
upgrade
/
dir825.sh
diff --git
a/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
b/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
index f77350303238b58ccd239c7a4bd647bff012579f..eac0aef1b83af87cf7a99dbeccf5869151dbd78e 100644
(file)
--- a/
target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
+++ b/
target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
@@
-75,7
+75,7
@@
dir825b_do_upgrade_combined() {
if [ -n "$fw_mtd" ] && [ ${fw_blocks:-0} -gt 0 ]; then
local append=""
if [ -n "$fw_mtd" ] && [ ${fw_blocks:-0} -gt 0 ]; then
local append=""
- [ -f "$CONF_TAR" -a "$UPGRADE_OPT_
UPGRADE_OPT_
SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+ [ -f "$CONF_TAR" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
sync
dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
sync
dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
@@
-148,7
+148,7
@@
platform_do_upgrade_dir825b() {
else
PART_NAME="firmware"
fi
else
PART_NAME="firmware"
fi
- default_do_upgrade "$
ARGV
"
+ default_do_upgrade "$
1
"
;;
"43493030")
if [ -z "$fw_mtd" ]; then
;;
"43493030")
if [ -z "$fw_mtd" ]; then
@@
-159,7
+159,7
@@
platform_do_upgrade_dir825b() {
exit 1
}
fi
exit 1
}
fi
- dir825b_do_upgrade_combined "firmware" "$
ARGV
"
+ dir825b_do_upgrade_combined "firmware" "$
1
"
;;
esac
}
;;
esac
}