From 6f259421e5cd0733717e80bd4a0a4da1c0aa5200 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 25 Jul 2011 22:19:55 +0000
Subject: [package] base-files: use "reboot -f" after sysupgrade to prevent
executing deleted init scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27776 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/base-files/Makefile | 2 +-
package/base-files/files/lib/upgrade/common.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'package')
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5553c99af..be10e2e95 100644
--- 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 bf9c40d29..11e1b2cdf 100644
--- 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
}
--
cgit v1.2.3