[backfire] backport r27776

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@27777 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8f9dea97011c56bb9a7d0cc9c70220984d3ceebc..baf40bc9b2b5edb66f0e75f337fd6c6aee78f295 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,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:=43.23
+PKG_RELEASE:=43.24

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

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index bf9c40d295dbfc068f50b521ee796db1954e5389..11e1b2cdfaa4d49c35a2d7ee7989f703fd62f67e 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -182,7 +182,7 @@ do_upgrade() {
        [ -n "$DELAY" ] && sleep "$DELAY"
        ask_bool 1 "Reboot" && {
                v "Rebooting system..."
        [ -n "$DELAY" ] && sleep "$DELAY"
        ask_bool 1 "Reboot" && {
                v "Rebooting system..."

-               reboot
+               reboot -f

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