From 94c728dc3949a74762866fe3f3faa75aeb8b8dda Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 25 Jul 2011 22:19:55 +0000 Subject: base-files: use "reboot -f" after sysupgrade to prevent executing deleted init scripts SVN-Revision: 27776 --- package/base-files/Makefile | 2 +- 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 } -- cgit v1.1