소스 검색

base-files: use "reboot -f" after sysupgrade to prevent executing deleted init scripts

SVN-Revision: 27776
Jo-Philipp Wich 14 년 전
부모
커밋
94c728dc39
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      package/base-files/Makefile
  2. 1 1
      package/base-files/files/lib/upgrade/common.sh

+ 1 - 1
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

+ 1 - 1
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
 	}