Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8189 from jefferyto/rtty-init

Browse source 
rtty: Update init script
This commit is contained in:
Rosen Penev 2019-04-14 23:39:38 -07:00 committed by GitHub
commit 6326b48d4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/rtty/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=rtty PKG_NAME:=rtty
PKG_VERSION:=6.5.0 PKG_VERSION:=6.5.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_VERSION:=v$(PKG_VERSION)

85
utils/rtty/files/rtty.init
View file

@ -5,55 +5,60 @@ START=99
BIN=/usr/sbin/rtty BIN=/usr/sbin/rtty
validate_rtty_section() {
uci_load_validate rtty rtty "$1" "$2" \
'interface:uci("network", "@interface"):lan' \
'id:maxlength(63)' \
'description:maxlength(126)' \
'host:host' \
'port:port' \
'ssl:bool:0' \
'keepalive:uinteger:5'
}
start_rtty() { start_rtty() {
. /lib/functions/network.sh . /lib/functions/network.sh
local cfg="$1" local ifname
local interface ifname id description host port ssl
uci_validate_section rtty rtty "${1}" \ [ "$2" = 0 ] || {
'interface:uci("network", "@interface"):lan' \ echo "validation failed" >&2
'id:maxlength(63)' \ return 1
'description:maxlength(126)' \ }
'host:host' \
'port:port' \
'ssl:bool:0' \
'keepalive:uinteger:5'
[ $? -ne 0 ] && {
echo "validation failed" >&2
return 1
}
[ -n "$interface" ] && network_get_device ifname "$interface" [ -n "$interface" ] && network_get_device ifname "$interface"
[ -z "$ifname" -a -z "$id" ] && { [ -z "$ifname" -a -z "$id" ] && {
echo "You must specify an interface or ID" >&2 echo "You must specify an interface or ID" >&2
return 1 return 1
} }
[ -z "$host" ] && { [ -z "$host" ] && {
echo "host required" >&2 echo "host required" >&2
return 1 return 1
} }
[ -z "$port" ] && {
echo "port required" >&2
return 1
}
procd_open_instance [ -z "$port" ] && {
procd_set_param command $BIN -h $host -p $port -a -k $keepalive echo "port required" >&2
[ -n "$ifname" ] && procd_append_param command -i "$ifname" return 1
[ -n "$id" ] && procd_append_param command -I "$id" }
[ -n "$description" ] && procd_append_param command -d "$description"
[ "$ssl" = "1" ] && procd_append_param command -s procd_open_instance
procd_set_param respawn procd_set_param command $BIN -h $host -p $port -a -k $keepalive
procd_close_instance [ -n "$ifname" ] && procd_append_param command -i "$ifname"
[ -n "$id" ] && procd_append_param command -I "$id"
[ -n "$description" ] && procd_append_param command -d "$description"
[ "$ssl" = "1" ] && procd_append_param command -s
procd_set_param respawn
procd_close_instance
} }
start_service() { start_service() {
config_load rtty config_load rtty
config_foreach start_rtty rtty config_foreach validate_rtty_section rtty start_rtty
} }
service_triggers() {
procd_add_reload_trigger "rtty"
procd_add_validation validate_rtty_section
}