Author: blogic
Date: 2014-09-01 15:21:54 +0200 (Mon, 01 Sep 2014)
New Revision: 42379
Modified:
branches/barrier_breaker/package/base-files/files/etc/init.d/system
branches/barrier_breaker/package/network/config/firewall/files/firewall.init
branches/barrier_breaker/package/network/config/netifd/files/etc/init.d/network
branches/barrier_breaker/package/network/services/dropbear/files/dropbear.init
branches/barrier_breaker/package/network/services/relayd/files/relay.init
branches/barrier_breaker/package/system/ubox/files/log.init
branches/barrier_breaker/package/utils/busybox/files/sysntpd
Log:
package/*: remove useless explicit set of function returncode
somebody started to set a function returncode in the validation
stuff and everybody copies it, e.g.
myfunction()
{
fire_command
return $?
}
a function automatically returns with the last returncode,
so we can safely remove the command 'return $?'. reference:
http://tldp.org/LDP/abs/html/exit-status.html
"The last command executed in the function or script determines the exit
status."
Signed-off-by: Bastian Bittorf <[email protected]>
Backport of r42278
Modified: branches/barrier_breaker/package/base-files/files/etc/init.d/system
===================================================================
--- branches/barrier_breaker/package/base-files/files/etc/init.d/system
2014-09-01 13:21:52 UTC (rev 42378)
+++ branches/barrier_breaker/package/base-files/files/etc/init.d/system
2014-09-01 13:21:54 UTC (rev 42379)
@@ -12,8 +12,6 @@
'buffersize:uinteger' \
'timezone:string:UTC' \
'zonename:string'
-
- return $?
}
system_config() {
Modified:
branches/barrier_breaker/package/network/config/firewall/files/firewall.init
===================================================================
---
branches/barrier_breaker/package/network/config/firewall/files/firewall.init
2014-09-01 13:21:52 UTC (rev 42378)
+++
branches/barrier_breaker/package/network/config/firewall/files/firewall.init
2014-09-01 13:21:54 UTC (rev 42379)
@@ -15,8 +15,6 @@
'dest_ip:cidr' \
'dest_port:or(port, portrange)' \
'target:or("SNAT", "DNAT")'
-
- return $?
}
validate_firewall_rule()
@@ -28,8 +26,6 @@
'src_port:or(port, portrange)' \
'dest_port:or(port, portrange)' \
'target:string'
-
- return $?
}
service_triggers() {
Modified:
branches/barrier_breaker/package/network/config/netifd/files/etc/init.d/network
===================================================================
---
branches/barrier_breaker/package/network/config/netifd/files/etc/init.d/network
2014-09-01 13:21:52 UTC (rev 42378)
+++
branches/barrier_breaker/package/network/config/netifd/files/etc/init.d/network
2014-09-01 13:21:54 UTC (rev 42379)
@@ -50,8 +50,6 @@
'atmdev:uinteger:0' \
'encaps:or("llc", "vc"):llc' \
'payload:or("bridged", "routed"):bridged'
-
- return $?
}
validate_route_section()
@@ -64,8 +62,6 @@
'metric:uinteger' \
'mtu:uinteger' \
'table:or(range(0,65535),string)'
-
- return $?
}
validate_route6_section()
@@ -77,8 +73,6 @@
'metric:uinteger' \
'mtu:uinteger' \
'table:or(range(0,65535),string)'
-
- return $?
}
validate_rule_section()
@@ -94,8 +88,6 @@
'lookup:or(range(0,65535),string)' \
'goto:range(0,65535)' \
'action:or("prohibit", "unreachable", "blackhole", "throw")'
-
- return $?
}
validate_rule6_section()
@@ -111,8 +103,6 @@
'lookup:or(range(0,65535),string)' \
'goto:range(0,65535)' \
'action:or("prohibit", "unreachable", "blackhole", "throw")'
-
- return $?
}
validate_switch_section()
@@ -122,8 +112,6 @@
'enable:bool' \
'enable_vlan:bool' \
'reset:bool'
-
- return $?
}
validate_switch_vlan()
@@ -132,8 +120,6 @@
'device:string' \
'vlan:uinteger' \
'ports:list(ports)'
-
- return $?
}
service_triggers()
Modified:
branches/barrier_breaker/package/network/services/dropbear/files/dropbear.init
===================================================================
---
branches/barrier_breaker/package/network/services/dropbear/files/dropbear.init
2014-09-01 13:21:52 UTC (rev 42378)
+++
branches/barrier_breaker/package/network/services/dropbear/files/dropbear.init
2014-09-01 13:21:54 UTC (rev 42379)
@@ -47,7 +47,6 @@
'Port:list(port):22' \
'SSHKeepAlive:uinteger:300' \
'IdleTimeout:uinteger:0'
- return $?
}
dropbear_instance()
Modified:
branches/barrier_breaker/package/network/services/relayd/files/relay.init
===================================================================
--- branches/barrier_breaker/package/network/services/relayd/files/relay.init
2014-09-01 13:21:52 UTC (rev 42378)
+++ branches/barrier_breaker/package/network/services/relayd/files/relay.init
2014-09-01 13:21:54 UTC (rev 42379)
@@ -15,8 +15,6 @@
'table:range(0, 65535):16800' \
'forward_bcast:bool:1' \
'forward_dhcp:bool:1'
-
- return $?
}
resolve_ifname() {
Modified: branches/barrier_breaker/package/system/ubox/files/log.init
===================================================================
--- branches/barrier_breaker/package/system/ubox/files/log.init 2014-09-01
13:21:52 UTC (rev 42378)
+++ branches/barrier_breaker/package/system/ubox/files/log.init 2014-09-01
13:21:54 UTC (rev 42379)
@@ -19,7 +19,6 @@
'log_port:port:514' \
'log_proto:or("tcp", "udp"):udp' \
'log_prefix:string'
- return $?
}
validate_log_daemon()
@@ -27,7 +26,6 @@
uci_validate_section system system "${1}" \
'log_size:uinteger:0' \
'log_buffer_size:uinteger:0'
- return $?
}
start_service_daemon()
Modified: branches/barrier_breaker/package/utils/busybox/files/sysntpd
===================================================================
--- branches/barrier_breaker/package/utils/busybox/files/sysntpd
2014-09-01 13:21:52 UTC (rev 42378)
+++ branches/barrier_breaker/package/utils/busybox/files/sysntpd
2014-09-01 13:21:54 UTC (rev 42379)
@@ -9,7 +9,6 @@
validate_ntp_section() {
uci_validate_section system timeserver "${1}" \
'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0'
- return $?
}
start_service() {
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
