From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 20 Feb 2017 09:49:33 +0000 (+0100)
Subject: netifd: fix stopping netifd + interfaces
X-Git-Tag: v18.06.0-rc1~3520
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=942ac18c8a6d7dbe9ad3b4ac9ef06cbd891ad954;p=oweals%2Fopenwrt.git

netifd: fix stopping netifd + interfaces

stop() is overwritten by rc.common, so implement stop_service instead.
While at it, remove the now unnecessary restart() override

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
index bdadbbce6d..a825dfd31f 100755
--- a/package/network/config/netifd/files/etc/init.d/network
+++ b/package/network/config/netifd/files/etc/init.d/network
@@ -31,9 +31,10 @@ reload_service() {
 	/sbin/wifi reload_legacy
 }
 
-stop() {
+stop_service() {
 	/sbin/wifi down
-	procd_kill network ''
+	ifdown -a
+	sleep 1
 }
 
 service_running() {
@@ -137,14 +138,6 @@ service_triggers()
 	procd_close_validate
 }
 
-restart() {
-	ifdown -a
-	sleep 1
-	trap '' TERM
-	stop "$@"
-	start "$@"
-}
-
 shutdown() {
 	ifdown -a
 	sleep 1