add patch from #2111

SVN-Revision: 8106

diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh
index 8d1117163d35401bca4da054735e3d8cd2f1deb1..24c6826870ee1de00ebeece4115d3d8043d259e0 100755 (executable)
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -133,14 +133,16 @@ config_set() {
 
 config_foreach() {
        local function="$1"
-       local type="$2"
+       [ "$#" -ge 1 ] && shift
+       local type="$1"
+       [ "$#" -ge 1 ] && shift
        local section cfgtype
        
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do
                config_get cfgtype "$section" TYPE
                [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
-               eval "$function \"\$section\""
+               eval "$function \"\$section\" \"\$@\""
        done
 }
 

diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index 4ffc79890a94c5f115bee58f0c7ad6cd52de7d19..99e2a5db62da17844e560fce365a850f0b64f7b5 100755 (executable)
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -67,24 +67,26 @@ EOF
 }
 
 initscript="$1"
-action="$2"
+[ "$#" -ge 1 ] && shift
+action="$1"
+[ "$#" -ge 1 ] && shift
 
 . "$initscript"
 
 cmds=
 for cmd in $EXTRA_COMMANDS; do
-       cmds="${cmds:+$cmds$N}$cmd) $cmd;;"
+       cmds="${cmds:+$cmds$N}$cmd) $cmd \"\$@\";;"
 done
 eval "case \"\$action\" in
-       start) start;;
-       stop) stop;;
-       reload) reload || restart;;
-       restart) restart;;
-       boot) boot;;
-       shutdown) shutdown;;
-       enable) enable;;
-       enabled) enabled;;
-       disable) disable;;
+       start) start \"\$@\";;
+       stop) stop \"\$@\";;
+       reload) reload \"\$@\" || restart \"\$@\";;
+       restart) restart \"\$@\";;
+       boot) boot \"\$@\";;
+       shutdown) shutdown \"\$@\";;
+       enable) enable \"\$@\";;
+       enabled) enabled \"\$@\";;
+       disable) disable \"\$@\";;
        $cmds
        *) help;;
 esac"