[package] base-files: use "reboot -f" after sysupgrade to prevent executing deleted...
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 25 Jul 2011 22:19:55 +0000 (22:19 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 25 Jul 2011 22:19:55 +0000 (22:19 +0000)
SVN-Revision: 27776

package/base-files/Makefile
package/base-files/files/lib/upgrade/common.sh

index 5553c99..be10e2e 100644 (file)
@@ -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:=77
+PKG_RELEASE:=78
 
 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
index bf9c40d..11e1b2c 100644 (file)
@@ -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
        }