projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup MTD option handling
[openwrt.git]
/
package
/
base-files
/
files
/
lib
/
upgrade
/
common.sh
diff --git
a/package/base-files/files/lib/upgrade/common.sh
b/package/base-files/files/lib/upgrade/common.sh
index
59ac7a7
..
d4fb04b
100644
(file)
--- a/
package/base-files/files/lib/upgrade/common.sh
+++ b/
package/base-files/files/lib/upgrade/common.sh
@@
-45,7
+45,7
@@
pivot() { # <new_root> <old_root>
}
run_ramfs() { # <command> [...]
}
run_ramfs() { # <command> [...]
- install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/vi /bin/ls /bin/cat
+ install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/vi /bin/ls /bin/cat
/usr/bin/awk /usr/bin/hexdump /bin/sleep
install_bin /sbin/mtd
for file in $RAMFS_COPY_BIN; do
install_bin $file
install_bin /sbin/mtd
for file in $RAMFS_COPY_BIN; do
install_bin $file
@@
-130,11
+130,24
@@
jffs2_copy_config() {
fi
}
fi
}
+default_do_upgrade() {
+ if [ "$SAVE_CONFIG" -eq 1 -a -z "$USE_REFRESH" ]; then
+ get_image "$1" | mtd -j "$CONF_TAR" write - "${PART_NAME:-image}"
+ else
+ get_image "$1" | mtd write - "${PART_NAME:-image}"
+ fi
+ sync
+}
+
do_upgrade() {
v "Performing system upgrade..."
do_upgrade() {
v "Performing system upgrade..."
- platform_do_upgrade "$ARGV"
+ if type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
+ platform_do_upgrade "$ARGV"
+ else
+ default_do_upgrade "$ARGV"
+ fi
- [ "$SAVE_CONFIG" -eq 1 ] && {
+ [ "$SAVE_CONFIG" -eq 1
-a -n "$USE_REFRESH"
] && {
v "Refreshing partitions"
if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then
platform_refresh_partitions
v "Refreshing partitions"
if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then
platform_refresh_partitions
@@
-147,6
+160,7
@@
do_upgrade() {
jffs2_copy_config
fi
}
jffs2_copy_config
fi
}
+ v "Upgrade completed"
[ -n "$DELAY" ] && sleep "$DELAY"
ask_bool 1 "Reboot" && reboot
}
[ -n "$DELAY" ] && sleep "$DELAY"
ask_bool 1 "Reboot" && reboot
}
This page took
0.025839 seconds
and
4
git commands to generate.