X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Frc.common;h=78e2dd49409db557a91ad6e386b5e29e4635bb16;hp=4f1a4a3a086331177a97de15d696cae97fef9725;hb=5dade080429f461b8f02a8effb835cd309c1d50b;hpb=4052ceaa24c08c9c983a023997e654c55ce6481c

diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index 4f1a4a3a08..78e2dd4940 100755
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -1,7 +1,12 @@
 #!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 
-. $IPKG_INSTROOT/etc/functions.sh
+. $IPKG_INSTROOT/lib/functions.sh
+. $IPKG_INSTROOT/lib/functions/service.sh
+
+initscript=$1
+action=${2:-help}
+shift 2
 
 start() {
 	return 0
@@ -26,7 +31,7 @@ boot() {
 }
 
 shutdown() {
-	return 0
+	stop
 }
 
 disable() {
@@ -38,6 +43,10 @@ disable() {
 enable() {
 	name="$(basename "${initscript}")"
 	disable
+	[ -n "$START" -o -n "$STOP" ] || {
+		echo "/etc/init.d/$name does not have a START or STOP value"
+		return 1
+	}
 	[ "$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]}"
 }
@@ -66,27 +75,42 @@ $EXTRA_HELP
 EOF
 }
 
-initscript="$1"
-[ "$#" -ge 1 ] && shift
-action="$1"
-[ "$#" -ge 1 ] && shift
+# for procd
+start_service() {
+	return 0
+}
+
+stop_service() {
+	return 0
+}
+
+${INIT_TRACE:+set -x}
 
 . "$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"
+[ -n "$USE_PROCD" ] && {
+	. $IPKG_INSTROOT/lib/functions/procd.sh
+
+	rc_procd() {
+		procd_open_service "$(basename "$initscript")" "$initscript"
+		"$@"
+		procd_close_service
+	}
+
+	start() {
+		rc_procd start_service "$@"
+	}
+
+	stop() {
+		procd_kill "$(basename "$initscript")" "$1"
+	}
+
+	reload() {
+		start
+	}
+}
+
+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 "$@"