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 5afe3dc6ef64fed0f3abcdb002c28f2a8f396712..03016ba4c1b215c57fbd69a50dbbe9858c7dc91d 100644 (file)
--- 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 a2c0dbaeb8518373075fde2bcb747742a6c8da96..e0db37e7502db911b87b2f97703fc914c41c1a85 100644 (file)
--- 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
                        *)