owfs: convert init scripts to procd style

[feed/packages.git] / utils / owfs / files / owftpd.init

diff --git a/utils/owfs/files/owftpd.init b/utils/owfs/files/owftpd.init
index 010b2b939c364624a0ee163b648883407c9b3d27..a7e17c9387794c0beb48e247f238616dc12ecaf5 100644 (file)
--- a/utils/owfs/files/owftpd.init
+++ b/utils/owfs/files/owftpd.init
@@ -1,72 +1,81 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2012 OpenWrt.org
+# Copyright (C) 2009-2015 OpenWrt.org
 
-START=99
+START=95
+USE_PROCD=1
 
-SERVICE_WRITE_PID=1
-SERVICE_DAEMONIZE=1
+PROG=/usr/bin/owftpd
 
-# Needed for restricted TCP port 21
-DEFAULT_SERVICE_UID=0
-DEFAULT_SERVICE_GID=0
+append_arg() {
+       local cfg="$1"
+       local var="$2"
+       local opt="$3"
+       local def="$4"
+       local val
 
-append_device() {
-       append devices "$1"
+       config_get val "$cfg" "$var"
+       [ -n "$val" -o -n "$def" ] && procd_append_param command $opt "${val:-$def}"
 }
 
+append_bool() {
+       local cfg="$1"
+       local var="$2"
+       local opt="$3"
+       local def="$4"
+       local val
 
-start_owfs_daemon() {
-       local program="$1"
-       local config="$1"
-       local args="--foreground --error_print=1 $2"
-
+       config_get_bool val "$cfg" "$var" "$def"
+       [ "$val" = 1 ] && procd_append_param command "$opt"
+}
 
-       local enabled
-       config_get_bool enabled "$config" enabled 0
-       [ "${enabled}" -eq 0 ] && return 1
+append_plain() {
+       procd_append_param command "$1"
+}
 
-       local readonly
-       config_get_bool readonly "$config" readonly 0
-       [ "${readonly}" -eq 1 ] && append args "--readonly"
+append_param() {
+       local cfg="$1"
+       local var="$2"
+       local opt="$3"
+       local def="$4"
+       local val
 
-       local error_level
-       config_get error_level "$config" error_level
-       [ -n "${error_level}" ] && append args "--error_level=${error_level}"
+       config_get val "$cfg" "$var"
+       [ -n "$val" -o -n "$def" ] && procd_append_param "$opt" "${val:-$def}"
+}
 
-       local options
-       config_get options "$config" options
+start_instance() {
+       local cfg="$1"
+       local enabled
 
-       devices=""
-       config_list_foreach "$config" devices append_device
+       config_get_bool enabled "$cfg" 'enabled' '0'
+       [ "$enabled" = 0 ] && return 1
 
-       config_get SERVICE_UID "$config" uid "$DEFAULT_SERVICE_UID"
-       config_get SERVICE_GID "$config" gid "$DEFAULT_SERVICE_GID"
+       procd_open_instance
 
-       service_start "/usr/bin/$program" $args $options $devices
-}
+       procd_set_param command "$PROG" --foreground --error_print=1
 
-start_owftpd() {
-       local config="owftpd"
-       local args=""
+       # common parameters
+       append_bool "$cfg" readonly "--readonly"
+       append_arg "$cfg" error_level "--error_level"
+       config_list_foreach "$cfg" options append_plain
+       config_list_foreach "$cfg" devices append_plain
+       append_param "$cfg" user user
 
-       config_load "$config"
+       # owftpd-specific
+       append_arg "$cfg" port "--port"
+       append_arg "$cfg" max_connections "--max_connections"
 
-       local port
-       config_get port "$config" port
-       [ -n "${port}" ] && append args "--port=${port}"
+       procd_set_param respawn
 
-       local max_connections
-       config_get max_connections "$config" max_connections
-       [ -n "${max_connections}" ] && append args "--max_connections=${max_connections}"
+       procd_close_instance
 
-       start_owfs_daemon "$config" "$args"
 }
 
-
-start() {
-       start_owftpd
+service_triggers() {
+       procd_add_reload_trigger owftpd
 }
 
-stop() {
-       service_stop /usr/bin/owftpd
+start_service() {
+       config_load owftpd
+       config_foreach start_instance owftpd
 }