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 78e2dd49409db557a91ad6e386b5e29e4635bb16..e80af891e684fd8b6d416343ad9e09fb0d78d333 100755 (executable)
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -17,7 +17,7 @@ stop() {
 }
 
 reload() {
-       return 1
+       restart
 }
 
 restart() {
@@ -68,7 +68,7 @@ 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
@@ -84,33 +84,61 @@ stop_service() {
        return 0
 }
 
+service_triggers() {
+       return 0
+}
+
+service_running() {
+       return 0
+}
+
 ${INIT_TRACE:+set -x}
 
 . "$initscript"
 
 [ -n "$USE_PROCD" ] && {
-       . $IPKG_INSTROOT/lib/functions/procd.sh
+       EXTRA_COMMANDS="${EXTRA_COMMANDS} running trace"
 
+       . $IPKG_INSTROOT/lib/functions/procd.sh
+       basescript=$(readlink "$initscript")
        rc_procd() {
-               procd_open_service "$(basename "$initscript")" "$initscript"
+               local method="set"
+               [ -n "$2" ] && method="add"
+               procd_open_service "$(basename ${basescript:-$initscript})" "$initscript"
                "$@"
-               procd_close_service
+               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() {
-               procd_kill "$(basename "$initscript")" "$1"
+               stop_service "$@"
+               procd_kill "$(basename ${basescript:-$initscript})" "$1"
        }
 
        reload() {
-               start
+               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 "$@"