base-files: fix service_running check

[openwrt/staging/stintel.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 fa2df6cd25d7b778b08b4400a204d473fd0098f0..e950ec209dc6d2cbdfc9ab6ee996e82a33d7eb4e 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,45 +42,145 @@ 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() {
        name="$(basename "${initscript}")"
-       [ -x "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}" ]
+       name="${name##[SK][0-9][0-9]}"
+       {
+               [ -z "${START:-}" ] || [ -L "$IPKG_INSTROOT/etc/rc.d/S${START}$name" ]
+       } && {
+               [ -z "${STOP:-}" ] || [ -L "$IPKG_INSTROOT/etc/rc.d/K${STOP}$name" ]
+       }
 }
 
 depends() {
        return 0
 }
 
+ALL_HELP=""
+ALL_COMMANDS="boot shutdown depends"
+extra_command() {
+       local cmd="$1"
+       local help="$2"
+
+       local extra="$(printf "%-16s%s" "${cmd}" "${help}")"
+       ALL_HELP="${ALL_HELP}\t${extra}\n"
+       ALL_COMMANDS="${ALL_COMMANDS} ${cmd}"
+}
+
 help() {
        cat <<EOF
 Syntax: $initscript [command]
 
 Available commands:
-       start   Start the service
-       stop    Stop the service
-       restart Restart the service
-       reload  Reload configuration files (or restart if that fails)
-       enable  Enable service autostart
-       disable Disable service autostart
-$EXTRA_HELP
 EOF
+       echo -e "$ALL_HELP"
+}
+
+# for procd
+start_service() {
+       return 0
+}
+
+stop_service() {
+       return 0
+}
+
+service_triggers() {
+       return 0
+}
+
+service_data() {
+       return 0
+}
+
+service_running() {
+       local instance="${1:-*}"
+
+       procd_running "$(basename $initscript)" "$instance"
 }
 
 ${INIT_TRACE:+set -x}
 
+extra_command "start" "Start the service"
+extra_command "stop" "Stop the service"
+extra_command "restart" "Restart the service"
+extra_command "reload" "Reload configuration files (or restart if service does not implement reload)"
+extra_command "enable" "Enable service autostart"
+extra_command "disable" "Disable service autostart"
+extra_command "enabled" "Check if service is started on boot"
+
 . "$initscript"
 
-ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}"
+[ -n "$USE_PROCD" ] && {
+       extra_command "running" "Check if service is running"
+       extra_command "status" "Service status"
+       extra_command "trace" "Start with syscall 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() {
+               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="${ALL_COMMANDS} ${EXTRA_COMMANDS}"
+ALL_HELP="${ALL_HELP}${EXTRA_HELP}"
 list_contains ALL_COMMANDS "$action" || action=help
-[ "$action" = "reload" ] && action='eval reload "$@" || restart "$@" && :'
 $action "$@"