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 | 94c728dc3949a74762866fe3f3faa75aeb8b8dda (patch) | |
| tree | 9c3a71c8ea6d676c346df2ddfab318b1cc5483ff /package/base-files | |
| parent | 80956276a71f91f930f51f9798aea3bff5225363 (diff) | |
| download | mtk-20170518-94c728dc3949a74762866fe3f3faa75aeb8b8dda.zip mtk-20170518-94c728dc3949a74762866fe3f3faa75aeb8b8dda.tar.gz mtk-20170518-94c728dc3949a74762866fe3f3faa75aeb8b8dda.tar.bz2 | |
base-files: use "reboot -f" after sysupgrade to prevent executing deleted init scripts
SVN-Revision: 27776
Diffstat (limited to 'package/base-files')
| -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 5553c99..be10e2e 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 bf9c40d..11e1b2c 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 } |