From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 26 Jul 2009 12:34:09 +0000 (+0000)
Subject: simplify action handling in rc.common (#5558)
X-Git-Tag: reboot~22847
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=de3a491240544e31bc198a1f6662d3cef125c514;p=openwrt%2Fopenwrt.git

simplify action handling in rc.common (#5558)

SVN-Revision: 17012
---

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 "$@"