aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-07-25 22:19:55 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-07-25 22:19:55 +0000
commit94c728dc3949a74762866fe3f3faa75aeb8b8dda (patch)
tree9c3a71c8ea6d676c346df2ddfab318b1cc5483ff
parent80956276a71f91f930f51f9798aea3bff5225363 (diff)
downloadupstream-94c728dc3949a74762866fe3f3faa75aeb8b8dda.tar.gz
upstream-94c728dc3949a74762866fe3f3faa75aeb8b8dda.tar.bz2
upstream-94c728dc3949a74762866fe3f3faa75aeb8b8dda.zip
base-files: use "reboot -f" after sysupgrade to prevent executing deleted init scripts
SVN-Revision: 27776
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/files/lib/upgrade/common.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5553c99afb..be10e2e958 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 bf9c40d295..11e1b2cdfa 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
}