diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-25 22:19:55 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-25 22:19:55 +0000 |
| commit | 7b463936a2e338f0add62099dd9e115bae81536a (patch) | |
| tree | 7bf951dcf7fae716ab3daf93643e132f04e24ace | |
| parent | 94fd7309acb56d8d025a420023f4745ce3b01abc (diff) | |
| download | upstream-7b463936a2e338f0add62099dd9e115bae81536a.tar.gz upstream-7b463936a2e338f0add62099dd9e115bae81536a.tar.bz2 upstream-7b463936a2e338f0add62099dd9e115bae81536a.zip | |
[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
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/base-files/files/lib/upgrade/common.sh | 2 |
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 } |