luci-0.10: Merge r7111

diff --git a/libs/core/root/sbin/luci-reload b/libs/core/root/sbin/luci-reload
index 24cf76064bd568d63526dc8a5bbdbe30d2a19e6f..4bcac045b30a6b8aa11af3de08d68bb1154fb657 100755 (executable)
--- a/libs/core/root/sbin/luci-reload
+++ b/libs/core/root/sbin/luci-reload
@@ -13,10 +13,15 @@ apply_config() {
 }
 
 reload_exec() {
-       [ -x $2 ] && {
-               echo "Reloading $1... "
-               $2 >/dev/null 2>&1
-               [ -n "$3" -a "$?" != "$3" ] && echo '!!! Failed to reload' $1 '!!!'
+       local service="$1"
+       local ok="$3"
+       set -- $2
+       local cmd="$1"; shift
+       
+       [ -x "$cmd" ] && {
+               echo "Reloading $service... "
+               ( $cmd "$@" ) 2>/dev/null 1>&2
+               [ -n "$ok" -a "$?" != "$ok" ] && echo '!!! Failed to reload' $service '!!!'
        }
 }