X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b2f43424402231050937792fb8b78d0184643a98..f4a0466de8aebccfe4efdb150452ab6852a67582:/package/base-files/files/etc/rc.common?ds=sidebyside

diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index 453cdbf33..2b7bf5a11 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
 }
@@ -17,12 +21,12 @@ reload() {
 
 restart() {
 	trap '' TERM
-	stop
-	start
+	stop "$@"
+	start "$@"
 }
 
 boot() {
-	start
+	start "$@"
 }
 
 shutdown() {
@@ -38,8 +42,8 @@ disable() {
 enable() {
 	name="$(basename "${initscript}")"
 	disable
-	[ "$START" ] && ln -s "/etc/init.d/$name" "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}"
-	[ "$STOP"  ] && ln -s "/etc/init.d/$name" "$IPKG_INSTROOT/etc/rc.d/K${START}${name##K[0-9][0-9]}"
+	[ "$START" ] && ln -s "../init.d/$name" "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}"
+	[ "$STOP"  ] && ln -s "../init.d/$name" "$IPKG_INSTROOT/etc/rc.d/K${STOP}${name##K[0-9][0-9]}"
 }
 
 enabled() {
@@ -66,25 +70,9 @@ $EXTRA_HELP
 EOF
 }
 
-initscript="$1"
-action="$2"
-
 . "$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 "$@"