[package] sysupgrade: sync *before* mtd write, only fallback to sysrq-trigger if...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16488 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 81d63d9..f9ad4e7 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files

-PKG_RELEASE:=22
+PKG_RELEASE:=23

 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index d0ae8fe..2c39249 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -142,12 +142,12 @@ jffs2_copy_config() {
 }
 
 default_do_upgrade() {
 }
 
 default_do_upgrade() {

+       sync

        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
        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() {
 }
 
 do_upgrade() {


@@ -157,7 +157,7 @@ do_upgrade() {
        else
                default_do_upgrade "$ARGV"
        fi
        else
                default_do_upgrade "$ARGV"
        fi

-       
+

        [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && {
                v "Refreshing partitions"
                if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then
        [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && {
                v "Refreshing partitions"
                if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then


@@ -175,7 +175,8 @@ do_upgrade() {
        [ -n "$DELAY" ] && sleep "$DELAY"
        ask_bool 1 "Reboot" && {
                v "Rebooting system..."
        [ -n "$DELAY" ] && sleep "$DELAY"
        ask_bool 1 "Reboot" && {
                v "Rebooting system..."

-               echo b 2>/dev/null >/proc/sysrq-trigger

                reboot
                reboot

+               sleep 5
+               echo b 2>/dev/null >/proc/sysrq-trigger

        }
 }
        }
 }