The 'ddns-scripts' packages still uses not the procd service handling.
This commit changes this.
This change also resolves the issue where, if a UCI configuration is
already present, the process is blocked during installation via APK and
does not complete.
Signed-off-by: Florian Eckert <redacted>
Tested-by: Luiz Angelo Daros de Luca <redacted>
include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-scripts
-PKG_VERSION:=2.8.2
-PKG_RELEASE:=93
+PKG_VERSION:=2.8.3
+PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0
#!/bin/sh
-# there are other ACTIONs like ifupdate we don't need
+. /lib/functions.sh
+
+start_ddns_service() {
+ local cfg="$1"
+ local interface_event="$2"
+ local action="$3"
+
+ local interface
+
+ config_get interface $cfg interface
+ [ -z "$interface" ] && return
+
+ [ "$interface" != "$interface_event" ] && return
+
+ case "$action" in
+ ifup)
+ /etc/init.d/ddns start "$cfg"
+ ;;
+ ifdown)
+ /etc/init.d/ddns stop "$cfg"
+ ;;
+ esac
+}
+
+ddns_service() {
+ local action="$1"
+ local interface="$2"
+
+ config_load ddns
+ config_foreach start_ddns_service "service" "$interface" "$action"
+}
+
case "$ACTION" in
- ifup) # OpenWrt is giving a network not phys. Interface
- /etc/init.d/ddns enabled && /usr/lib/ddns/dynamic_dns_updater.sh -n "$INTERFACE" -- start
+ ifup)
+ /etc/init.d/ddns enabled && ddns_service "ifup" "$INTERFACE"
;;
ifdown)
- /usr/lib/ddns/dynamic_dns_updater.sh -n "$INTERFACE" -- stop
+ ddns_service "ifdown" "$INTERFACE"
;;
esac
#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
START=95
STOP=10
-boot() {
- return 0
-}
+PROG=/usr/lib/ddns/dynamic_dns_updater.sh
-kill() {
- /usr/lib/ddns/dynamic_dns_updater.sh -- kill
- return 0
-}
+start_ddns() {
+ local cfg="$1"
+
+ local enabled
-reload() {
- restart
+ config_get_bool enabled $cfg enabled '0'
+ [ "$enabled" = "0" ] && return
+
+ procd_open_instance "$cfg"
+ procd_set_param command $PROG
+ procd_append_param command -S "$cfg"
+ procd_set_param respawn
+ procd_close_instance
}
-restart() {
- /usr/lib/ddns/dynamic_dns_updater.sh -- stop
- sleep 1 # give time to shutdown
- /usr/lib/ddns/dynamic_dns_updater.sh -- start
+start_ddns_service() {
+ local cfg="$1"
+ local section="$2"
+
+ # start section if no section name is specified
+ [ -z "$section" ] && {
+ start_ddns "$cfg"
+ return
+ }
+
+ # start 'exactly' this section if a section name is specified
+ [ "$section" = "$cfg" ] && {
+ start_ddns "$cfg"
+ return
+ }
}
-start() {
- /usr/lib/ddns/dynamic_dns_updater.sh -- start
+start_service() {
+ local section="$1"
+
+ config_load ddns
+ config_foreach start_ddns_service "service" "$section"
}
-stop() {
- /usr/lib/ddns/dynamic_dns_updater.sh -- stop
- return 0
+service_triggers()
+{
+ procd_add_reload_trigger ddns
}
return 0
}
-# read's all service sections from ddns config
-# $1 = Name of variable to store
-load_all_service_sections() {
- local __DATA=""
- config_cb()
- {
- # only look for section type "service", ignore everything else
- [ "$1" = "service" ] && __DATA="$__DATA $2"
- }
- config_load "ddns"
-
- eval "$1=\"$__DATA\""
- return
-}
-
-# starts updater script for all given sections or only for the one given
-# $1 = interface (Optional: when given only scripts are started
-# configured for that interface)
-# used by /etc/hotplug.d/iface/95-ddns on IFUP
-# and by /etc/init.d/ddns start
-start_daemon_for_all_ddns_sections()
-{
- local event_if sections section_id configured_if
- event_if="$1"
-
- load_all_service_sections sections
- for section_id in $sections; do
- config_get configured_if "$section_id" interface "wan"
- [ -z "$event_if" ] || [ "$configured_if" = "$event_if" ] || continue
- /usr/lib/ddns/dynamic_dns_updater.sh -v "$VERBOSE" -S "$section_id" -- start &
- done
-}
-
-# stop sections process incl. childs (sleeps)
-# $1 = section
-stop_section_processes() {
- local pid_file
- pid_file="$ddns_rundir/$1.pid"
- [ $# -ne 1 ] && write_log 12 "Error: 'stop_section_processes()' requires exactly one parameter"
-
- [ -e "$pid_file" ] && {
- xargs kill < "$pid_file" 2>/dev/null && return 1
- }
- return 0 # nothing killed
-}
-
-# stop updater script for all defines sections or only for one given
-# $1 = interface (optional)
-# used by /etc/hotplug.d/iface/95-ddns on 'ifdown'
-# and by /etc/init.d/ddns stop
-# needed because we also need to kill "sleep" child processes
-stop_daemon_for_all_ddns_sections() {
- local event_if sections section_id configured_if
- event_if="$1"
-
- load_all_service_sections sections
- for section_id in $sections; do
- config_get configured_if "$section_id" interface "wan"
- [ -z "$event_if" ] || [ "$configured_if" = "$event_if" ] || continue
- stop_section_processes "$section_id"
- done
-}
-
# reports to console, logfile, syslog
# $1 loglevel 7 == Debug to 0 == EMERG
# value +10 will exit the scripts
-h => show this help and exit
-L => use_logfile=1 (default 0)
- -v LEVEL => VERBOSE=LEVEL (default 0)
-V => show version and exit
EOF
LOGFILE="$ddns_logdir/$SECTION_ID.log"
DATFILE="$ddns_rundir/$SECTION_ID.$$.dat" # save stdout data of WGet and other extern programs called
ERRFILE="$ddns_rundir/$SECTION_ID.$$.err" # save stderr output of WGet and other extern programs called
-DDNSPRG="/usr/lib/ddns/dynamic_dns_updater.sh"
-VERBOSE=0 # no console logging
# global variables normally set by reading DDNS UCI configuration
use_syslog=0 # no syslog
use_logfile=0 # no logfile
u) ip_url="$OPTARG"; ip_source="web";;
h) usage; exit 255;;
L) use_logfile=1;;
- v) VERBOSE=$OPTARG;;
S) SECTION=$OPTARG;;
V) printf %s\\n "ddns-scripts $VERSION"; exit 255;;
:) usage_err "option -$OPTARG missing argument";;
;;
start)
[ -z "$SECTION" ] && usage_err "command 'start': 'SECTION' not set"
- if [ "$VERBOSE" -eq 0 ]; then # start in background
- ("$DDNSPRG" -v 0 -S "$SECTION" -- start >/dev/null 2>&1 &)
- else
- "$DDNSPRG" -v "$VERBOSE" -S "$SECTION" -- start
- fi
+ /etc/init.d/ddns start "$SECTION"
;;
reload)
- "$DDNSPRG" -- reload
+ /etc/init.d/ddns reload
;;
restart)
- "$DDNSPRG" -- stop
- sleep 1
- "$DDNSPRG" -- start >/dev/null 2>&1
+ /etc/init.d/ddns restart
;;
stop)
if [ -n "$SECTION" ]; then
- # section stop
- "$DDNSPRG" -S "$SECTION" -- stop
+ /etc/init.d/ddns stop "$SECTION"
else
- # global stop
- "$DDNSPRG" -- stop
+ /etc/init.d/ddns stop
fi
;;
*)
cat << EOF
Usage:
- $MYPROG [options] -- command
-
-Commands:
-start Start SECTION or NETWORK or all
-stop Stop SECTION or NETWORK or all
+ $MYPROG [options]
Parameters:
- -n NETWORK Start/Stop sections in background monitoring NETWORK, force VERBOSE=0
-S SECTION SECTION to start
use either -N NETWORK or -S SECTION
h) usage; exit 0;;
v) VERBOSE=$OPTARG;;
d) DRY_RUN=1;;
- n) NETWORK=$OPTARG;;
S) SECTION_ID=$OPTARG;;
V) printf %s\\n "ddns-scripts $VERSION"; exit 0;;
:) usage_err "option -$OPTARG missing argument";;
done
shift $((OPTIND - 1 )) # OPTIND is 1 based
-[ -n "$NETWORK" -a -n "$SECTION_ID" ] && usage_err "use either option '-N' or '-S' not both"
-[ $# -eq 0 ] && usage_err "missing command"
-[ $# -gt 1 ] && usage_err "to much commands"
-
-case "$1" in
- start)
- if [ -n "$NETWORK" ]; then
- start_daemon_for_all_ddns_sections "$NETWORK"
- exit 0
- fi
- if [ -z "$SECTION_ID" ]; then
- start_daemon_for_all_ddns_sections
- exit 0
- fi
- ;;
- stop)
- if [ -n "$SECTION_ID" ]; then
- stop_section_processes "$SECTION_ID"
- exit 0
- fi
- if [ -n "$NETWORK" ]; then
- stop_daemon_for_all_ddns_sections "$NETWORK"
- exit 0
- else
- stop_daemon_for_all_ddns_sections
- exit 0
- fi
- exit 1
- ;;
- kill)
- killall dynamic_dns_updater.sh 2>/dev/null
- exit $?
- ;;
- *) usage_err "unknown command - $1";;
-esac
+[ -z "$SECTION_ID" ] && usage_err "option '-N' is missing"
# set file names
PIDFILE="$ddns_rundir/$SECTION_ID.pid" # Process ID file
git.99rst.org / openwrt-packages.git / commitdiff