X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Frc.common;h=83ece4930f13c81c1ad93e613989593a3b19e3de;hb=3a9bfa5938ab4d98a7c7ee10fca4b25101bbc0f9;hp=453cdbf33ac3e6e658bdf7377b81e16f21a7e200;hpb=bef40307bb2843b303b80d82b80a0b4b89f90878;p=librecmc%2Flibrecmc.git

diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index 453cdbf33a..83ece4930f 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
@@ -17,16 +22,16 @@ reload() {
 
 restart() {
 	trap '' TERM
-	stop
-	start
+	stop "$@"
+	start "$@"
 }
 
 boot() {
-	start
+	start "$@"
 }
 
 shutdown() {
-	return 0
+	stop
 }
 
 disable() {
@@ -38,8 +43,12 @@ 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]}"
+	[ -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]}"
 }
 
 enabled() {
@@ -66,25 +75,64 @@ $EXTRA_HELP
 EOF
 }
 
-initscript="$1"
-action="$2"
+# for procd
+start_service() {
+	return 0
+}
+
+stop_service() {
+	return 0
+}
+
+service_triggers() {
+	return 0
+}
+
+service_running() {
+	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" ] && {
+	EXTRA_COMMANDS="${EXTRA_COMMANDS} running"
+
+	. $IPKG_INSTROOT/lib/functions/procd.sh
+	basescript=$(readlink "$initscript")
+	rc_procd() {
+		procd_open_service "$(basename ${basescript:-$initscript})" "$initscript"
+		"$@"
+		procd_close_service
+	}
+
+	start() {
+		rc_procd start_service "$@"
+		if eval "type service_started" 2>/dev/null >/dev/null; then
+			service_started
+		fi
+	}
+
+	stop() {
+		stop_service "$@"
+		procd_kill "$(basename ${basescript:-$initscript})" "$1"
+	}
+
+	reload() {
+		if eval "type reload_service" 2>/dev/null >/dev/null; then
+			reload_service "$@"
+		else
+			restart
+		fi
+	}
+
+	running() {
+		service_running "$@"
+	}
+}
+
+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 "$@"