add patch from #2111

SVN-Revision: 8106
master
Felix Fietkau 18 years ago
parent 2a43eb3bd9
commit 6330c58b58
  1. 6
      package/base-files/files/etc/functions.sh
  2. 24
      package/base-files/files/etc/rc.common

@ -146,14 +146,16 @@ config_set() {
config_foreach() { config_foreach() {
local function="$1" local function="$1"
local type="$2" [ "$#" -ge 1 ] && shift
local type="$1"
[ "$#" -ge 1 ] && shift
local section cfgtype local section cfgtype
[ -z "$CONFIG_SECTIONS" ] && return 0 [ -z "$CONFIG_SECTIONS" ] && return 0
for section in ${CONFIG_SECTIONS}; do for section in ${CONFIG_SECTIONS}; do
config_get cfgtype "$section" TYPE config_get cfgtype "$section" TYPE
[ -n "$type" -a "x$cfgtype" != "x$type" ] && continue [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
eval "$function \"\$section\"" eval "$function \"\$section\" \"\$@\""
done done
} }

@ -67,24 +67,26 @@ EOF
} }
initscript="$1" initscript="$1"
action="$2" [ "$#" -ge 1 ] && shift
action="$1"
[ "$#" -ge 1 ] && shift
. "$initscript" . "$initscript"
cmds= cmds=
for cmd in $EXTRA_COMMANDS; do for cmd in $EXTRA_COMMANDS; do
cmds="${cmds:+$cmds$N}$cmd) $cmd;;" cmds="${cmds:+$cmds$N}$cmd) $cmd \"\$@\";;"
done done
eval "case \"\$action\" in eval "case \"\$action\" in
start) start;; start) start \"\$@\";;
stop) stop;; stop) stop \"\$@\";;
reload) reload || restart;; reload) reload \"\$@\" || restart \"\$@\";;
restart) restart;; restart) restart \"\$@\";;
boot) boot;; boot) boot \"\$@\";;
shutdown) shutdown;; shutdown) shutdown \"\$@\";;
enable) enable;; enable) enable \"\$@\";;
enabled) enabled;; enabled) enabled \"\$@\";;
disable) disable;; disable) disable \"\$@\";;
$cmds $cmds
*) help;; *) help;;
esac" esac"

Loading…
Cancel
Save