From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 3 Nov 2011 19:25:25 +0000 (+0000)
Subject: base-files: add some more protected services to sysupgrade kill blacklist
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e3daeabda38fff68d4a6f82869dfaa9068cf0e4e;p=openwrt%2Fstaging%2Frobimarko.git

base-files: add some more protected services to sysupgrade kill blacklist

SVN-Revision: 28732
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5afe3dc6ef..03016ba4c1 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:=85
+PKG_RELEASE:=86
 
 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 a2c0dbaeb8..e0db37e750 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -87,7 +87,7 @@ kill_remaining() { # [ <signal> ]
 		esac
 		case "$cmd" in
 			# Skip kernel threads and essential services
-			\[*\]|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*) : ;;
+			\[*\]|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*ubusd*|*netifd*|*hostapd*|*wpa_supplicant*) : ;;
 
 			# Killable process
 			*)