netifd: fix an error message during network shutdown

[openwrt/staging/chunkeey.git] / package / network / config / netifd / files / etc / init.d / network

diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
index 2e22732a9f2027a3e26a17d20a640d63748840dd..fbba9ecb1ccc8673bc0d88be385dbba022126c6b 100755 (executable)
--- a/package/network/config/netifd/files/etc/init.d/network
+++ b/package/network/config/netifd/files/etc/init.d/network
@@ -18,6 +18,7 @@ start_service() {
        procd_open_instance
        procd_set_param command /sbin/netifd
        procd_set_param respawn
+       procd_set_param watch network.interface
        [ -e /proc/sys/kernel/core_pattern ] && {
                procd_set_param limits core="unlimited"
                echo '/tmp/%e.%p.%s.%t.core' > /proc/sys/kernel/core_pattern
@@ -31,8 +32,9 @@ reload_service() {
        /sbin/wifi reload_legacy
 }
 
-stop_service() {
+stop() {
        /sbin/wifi down
+       procd_kill network ''
 }
 
 service_running() {
@@ -49,8 +51,6 @@ validate_atm_bridge_section()
                'atmdev:uinteger:0' \
                'encaps:or("llc", "vc"):llc' \
                'payload:or("bridged", "routed"):bridged'
-
-       return $?
 }
 
 validate_route_section()
@@ -63,8 +63,6 @@ validate_route_section()
                'metric:uinteger' \
                'mtu:uinteger' \
                'table:or(range(0,65535),string)'
-
-       return $?
 }
 
 validate_route6_section()
@@ -76,8 +74,6 @@ validate_route6_section()
                'metric:uinteger' \
                'mtu:uinteger' \
                'table:or(range(0,65535),string)'
-
-       return $?
 }
 
 validate_rule_section()
@@ -93,8 +89,6 @@ validate_rule_section()
                'lookup:or(range(0,65535),string)' \
                'goto:range(0,65535)' \
                'action:or("prohibit", "unreachable", "blackhole", "throw")'
-
-       return $?
 }
 
 validate_rule6_section()
@@ -110,8 +104,6 @@ validate_rule6_section()
                'lookup:or(range(0,65535),string)' \
                'goto:range(0,65535)' \
                'action:or("prohibit", "unreachable", "blackhole", "throw")'
-
-       return $?
 }
 
 validate_switch_section()
@@ -121,8 +113,6 @@ validate_switch_section()
                'enable:bool' \
                'enable_vlan:bool' \
                'reset:bool'
-
-       return $?
 }
 
 validate_switch_vlan()
@@ -131,16 +121,11 @@ validate_switch_vlan()
                'device:string' \
                'vlan:uinteger' \
                'ports:list(ports)'
-
-       return $?
 }
 
 service_triggers()
 {
-       procd_open_trigger
-       procd_add_config_trigger "config.change" "network" /etc/init.d/network reload
-       procd_add_config_trigger "config.change" "wireless" /etc/init.d/network reload
-       procd_close_trigger
+       procd_add_reload_trigger network wireless
 
        procd_open_validate
        validate_atm_bridge_section