projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] sysupgrade: use sysrq-trigger if available
[openwrt/svn-archive/archive.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 6cc09e1a4649fea0518efab510daf36871598c73..9ba9e23e7e8067264df31c7f1f553a5c28d61156 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
+ 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 /bin/zcat
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
@@
-105,15
+105,18
@@
rootfs_type() {
get_image() {
local from="$1"
get_image() {
local from="$1"
+ local conc="cat"
+
+ [ $GZIPED -eq 1 ] && conc="zcat"
case "$from" in
case "$from" in
- http://*|ftp://*) wget -O- -q "$from";;
- *) cat "$from"
+ http://*|ftp://*) wget -O- -q "$from"
| "$conc"
;;
+ *) cat "$from"
| "$conc";;
esac
}
get_magic_word() {
esac
}
get_magic_word() {
- get_image "$1" | dd bs=2 count=1 2>/dev/null | hexdump
| awk '$2 { print $2
}'
+ get_image "$1" | dd bs=2 count=1 2>/dev/null | hexdump
-C | awk '$2 { print $2 $3
}'
}
refresh_mtd_partitions() {
}
refresh_mtd_partitions() {
@@
-130,11
+133,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,5
+163,11
@@
do_upgrade() {
jffs2_copy_config
fi
}
jffs2_copy_config
fi
}
- ask_bool 1 "Reboot" && reboot
+ v "Upgrade completed"
+ [ -n "$DELAY" ] && sleep "$DELAY"
+ ask_bool 1 "Reboot" && {
+ v "Rebooting system..."
+ echo b 2>/dev/null >/proc/sysrq-trigger
+ reboot
+ }
}
}