X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/53c5ad6fa854740c2a5d36f748577a349c1432e9..dd8b9f6554fd38fc7f8af6fee016adbc8556fd4f:/package/base-files/files/etc/rc.common

diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index 1e6c5e912..4f1a4a3a0 100755
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -3,8 +3,6 @@
 
 . $IPKG_INSTROOT/etc/functions.sh
 
-START=50
-
 start() {
 	return 0
 }
@@ -18,12 +16,13 @@ reload() {
 }
 
 restart() {
-	stop
-	start
+	trap '' TERM
+	stop "$@"
+	start "$@"
 }
 
 boot() {
-	start
+	start "$@"
 }
 
 shutdown() {
@@ -33,12 +32,14 @@ shutdown() {
 disable() {
 	name="$(basename "${initscript}")"
 	rm -f "$IPKG_INSTROOT"/etc/rc.d/S??$name
+	rm -f "$IPKG_INSTROOT"/etc/rc.d/K??$name
 }
 
 enable() {
 	name="$(basename "${initscript}")"
 	disable
-	ln -s "/etc/init.d/$name" "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[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,24 +67,26 @@ EOF
 }
 
 initscript="$1"
-action="$2"
+[ "$#" -ge 1 ] && shift
+action="$1"
+[ "$#" -ge 1 ] && shift
 
 . "$initscript"
 
 cmds=
 for cmd in $EXTRA_COMMANDS; do
-	cmds="${cmds:+$cmds$N}$cmd) $cmd;;"
+	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;;
+	start) start \"\$@\";;
+	stop) stop \"\$@\";;
+	reload) reload \"\$@\" || restart \"\$@\";;
+	restart) restart \"\$@\";;
+	boot) boot \"\$@\";;
+	shutdown) shutdown \"\$@\";;
+	enable) enable \"\$@\";;
+	enabled) enabled \"\$@\";;
+	disable) disable \"\$@\";;
 	$cmds
 	*) help;;
 esac"