rc.common: when reloading a service using procd, fall back to calling start instead...

[openwrt/openwrt.git] / 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 6ec88aef9c1e20040bb605235207f0ca0d4ee79b..695fc166fbcd1af6432016511f63d723174a0504 100755 (executable)
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -1,7 +1,8 @@
 #!/bin/sh
-# Copyright (C) 2006-2009 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}
@@ -42,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]}"
 }
@@ -70,8 +75,63 @@ $EXTRA_HELP
 EOF
 }
 
+# for procd
+start_service() {
+       return 0
+}
+
+stop_service() {
+       return 0
+}
+
+service_triggers() {
+       return 0
+}
+
+service_running() {
+       return 0
+}
+
+${INIT_TRACE:+set -x}
+
 . "$initscript"
 
+[ -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
+                       start
+               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 "$@" && :'