aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-11-03 19:25:25 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-11-03 19:25:25 +0000
commite3daeabda38fff68d4a6f82869dfaa9068cf0e4e (patch)
tree3eee154380ef49c5bd8550b624bf57a2f4cc5d0f /package
parent48c37ff7ebc40252ae4aa1393b74a681e85a220f (diff)
downloadupstream-e3daeabda38fff68d4a6f82869dfaa9068cf0e4e.tar.gz
upstream-e3daeabda38fff68d4a6f82869dfaa9068cf0e4e.tar.bz2
upstream-e3daeabda38fff68d4a6f82869dfaa9068cf0e4e.zip
base-files: add some more protected services to sysupgrade kill blacklist
SVN-Revision: 28732
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/files/lib/upgrade/common.sh2
2 files changed, 2 insertions, 2 deletions
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
*)