base-files: fix default procd reload

[openwrt/staging/mkresin.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 f9dc83d966de0acae227297f0b284de66557808f..e80af891e684fd8b6d416343ad9e09fb0d78d333 100755 (executable)
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 
 . $IPKG_INSTROOT/lib/functions.sh
 . $IPKG_INSTROOT/lib/functions/service.sh
@@ -17,7 +17,7 @@ stop() {
 }
 
 reload() {
-       return 1
+       restart
 }
 
 restart() {
@@ -68,16 +68,77 @@ Available commands:
        start   Start the service
        stop    Stop the service
        restart Restart the service
-       reload  Reload configuration files (or restart if that fails)
+       reload  Reload configuration files (or restart if service does not implement reload)
        enable  Enable service autostart
        disable Disable service autostart
 $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 trace"
+
+       . $IPKG_INSTROOT/lib/functions/procd.sh
+       basescript=$(readlink "$initscript")
+       rc_procd() {
+               local method="set"
+               [ -n "$2" ] && method="add"
+               procd_open_service "$(basename ${basescript:-$initscript})" "$initscript"
+               "$@"
+               procd_close_service "$method"
+       }
+
+       start() {
+               rc_procd start_service "$@"
+               if eval "type service_started" 2>/dev/null >/dev/null; then
+                       service_started
+               fi
+       }
+
+       trace() {
+               TRACE_SYSCALLS=1
+               start "$@"
+       }
+
+       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 "$@" && :'
 $action "$@"