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 453cdbf33ac3e6e658bdf7377b81e16f21a7e200..d3fa3be5058dcdd146bfaa5afa63b1fe77dabeff 100755 (executable)
--- 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
@@ -12,21 +17,22 @@ stop() {
 }
 
 reload() {
-       return 1
+       restart
 }
 
 restart() {
        trap '' TERM
-       stop
-       start
+       stop "$@"
+       trap - TERM
+       start "$@"
 }
 
 boot() {
-       start
+       start "$@"
 }
 
 shutdown() {
-       return 0
+       stop
 }
 
 disable() {
@@ -36,10 +42,15 @@ disable() {
 }
 
 enable() {
+       err=1
        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]}"
+       [ "$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() {
@@ -59,32 +70,100 @@ 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
 }
 
-initscript="$1"
-action="$2"
+# for procd
+start_service() {
+       return 0
+}
+
+stop_service() {
+       return 0
+}
+
+service_triggers() {
+       return 0
+}
+
+service_data() {
+       return 0
+}
+
+service_running() {
+       local service="${1:-$(basename $initscript)}"
+       local instance="${2:-*}"
+       procd_running "$service" "$instance" "$@"
+}
+
+${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 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 "$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_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
+                       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 "$@"