base-files: use "reboot -f" after sysupgrade to prevent executing deleted init scripts

SVN-Revision: 27776

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5553c99afb6d1399d918a910e0285b3081f1503e..be10e2e958d4e44d838577568eeccb3a3d15244a 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
-PKG_RELEASE:=77
+PKG_RELEASE:=78
 
 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..."
-               reboot
+               reboot -f
                sleep 5
                echo b 2>/dev/null >/proc/sysrq-trigger
        }