base-files,procd: add generic service status

[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 83ece4930f13c81c1ad93e613989593a3b19e3de..d3fa3be5058dcdd146bfaa5afa63b1fe77dabeff 100755 (executable)
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -17,12 +17,13 @@ stop() {
 }
 
 reload() {
-       return 1
+       restart
 }
 
 restart() {
        trap '' TERM
        stop "$@"
+       trap - TERM
        start "$@"
 }
 
@@ -41,14 +42,15 @@ disable() {
 }
 
 enable() {
+       err=1
        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]}"
+       [ "$START" ] && \
+               ln -sf "../init.d/$name" "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}" && \
+               err=0
+       [ "$STOP" ] && \
+               ln -sf "../init.d/$name" "$IPKG_INSTROOT/etc/rc.d/K${STOP}${name##K[0-9][0-9]}" && \
+               err=0
+       return $err
 }
 
 enabled() {
@@ -68,7 +70,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
@@ -88,23 +90,35 @@ service_triggers() {
        return 0
 }
 
-service_running() {
+service_data() {
        return 0
 }
 
+service_running() {
+       local service="${1:-$(basename $initscript)}"
+       local instance="${2:-*}"
+       procd_running "$service" "$instance" "$@"
+}
+
 ${INIT_TRACE:+set -x}
 
 . "$initscript"
 
 [ -n "$USE_PROCD" ] && {
-       EXTRA_COMMANDS="${EXTRA_COMMANDS} running"
+       EXTRA_COMMANDS="${EXTRA_COMMANDS} running status trace"
+       EXTRA_HELP="\
+       running Check if service is running
+       status  Service status
+       "
 
        . $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
+               procd_close_service "$method"
        }
 
        start() {
@@ -114,25 +128,42 @@ ${INIT_TRACE:+set -x}
                fi
        }
 
+       trace() {
+               TRACE_SYSCALLS=1
+               start "$@"
+       }
+
        stop() {
+               procd_lock
                stop_service "$@"
                procd_kill "$(basename ${basescript:-$initscript})" "$1"
+               if eval "type service_stopped" 2>/dev/null >/dev/null; then
+                       service_stopped
+               fi
        }
 
        reload() {
                if eval "type reload_service" 2>/dev/null >/dev/null; then
+                       procd_lock
                        reload_service "$@"
                else
-                       restart
+                       start
                fi
        }
 
        running() {
                service_running "$@"
        }
+
+       status() {
+               if eval "type status_service" 2>/dev/null >/dev/null; then
+                       status_service "$@"
+               else
+                       _procd_status "$(basename ${basescript:-$initscript})" "$1"
+               fi
+       }
 }
 
 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 "$@"