From: John Crispin <john@openwrt.org>
Date: Mon, 2 Jun 2014 12:42:44 +0000 (+0000)
Subject: base-files: calling stop_service before procd_kill.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=44e2de03a4a96a01a732b33bf14c059da1924304;p=openwrt%2Fstaging%2Fadrian.git

base-files: calling stop_service before procd_kill.

Before this patch, doing `/e/c/network restart' will emit the folloing
error by `ubus network.wireless down "{}"' because netifd already quit
by that time.

	Command failed: not found

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

SVN-Revision: 40906
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 207af35266..eea9ecb8e0 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=152
+PKG_RELEASE:=153
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index 829ec76bac..8701312e4c 100755
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -112,8 +112,8 @@ ${INIT_TRACE:+set -x}
 	}
 
 	stop() {
-		procd_kill "$(basename ${basescript:-$initscript})" "$1"
 		stop_service "$@"
+		procd_kill "$(basename ${basescript:-$initscript})" "$1"
 	}
 
 	reload() {