aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-07-26 12:34:09 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-07-26 12:34:09 +0000
commita1ae0405b213857bbfbed98179942a4f31747053 (patch)
tree91c9bec2ce02ae454e48d41be1a50b5e165fd5a4
parent5556ec29766e2ed44bdf0e8b4b5dfe37e5521413 (diff)
downloadupstream-a1ae0405b213857bbfbed98179942a4f31747053.tar.gz
upstream-a1ae0405b213857bbfbed98179942a4f31747053.tar.bz2
upstream-a1ae0405b213857bbfbed98179942a4f31747053.zip
[pakcage] simplify action handling in rc.common (#5558)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17012 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/etc/rc.common32
1 files changed, 9 insertions, 23 deletions
diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index 4f1a4a3a08..2b7bf5a110 100755
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -1,8 +1,12 @@
#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
. $IPKG_INSTROOT/etc/functions.sh
+initscript=$1
+action=${2:-help}
+shift 2
+
start() {
return 0
}
@@ -66,27 +70,9 @@ $EXTRA_HELP
EOF
}
-initscript="$1"
-[ "$#" -ge 1 ] && shift
-action="$1"
-[ "$#" -ge 1 ] && shift
-
. "$initscript"
-cmds=
-for cmd in $EXTRA_COMMANDS; do
- 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 \"\$@\";;
- $cmds
- *) help;;
-esac"
+ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}"
+list_contains ALL_COMMANDS "$action" || action=help
+[ "$action" == reload ] && action='eval reload "$@" || restart "$@" && :'
+$action "$@"