From a1ae0405b213857bbfbed98179942a4f31747053 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 26 Jul 2009 12:34:09 +0000 Subject: [PATCH] [pakcage] simplify action handling in rc.common (#5558) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17012 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/rc.common | 32 ++++++++------------------ 1 file 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 "$@"