From 69aebd4f4f4f8cf244276c4967813061412aed21 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 8 Nov 2022 21:08:16 +0100 Subject: [PATCH 1/6] asterisk: use return in init script "start_service()" is a function, hence "return" should be used instead of "exit". Signed-off-by: Sebastian Kemper --- net/asterisk/files/asterisk.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/asterisk/files/asterisk.init b/net/asterisk/files/asterisk.init index 2e02f06..51ab259 100644 --- a/net/asterisk/files/asterisk.init +++ b/net/asterisk/files/asterisk.init @@ -26,7 +26,7 @@ start_service() { config_get_bool enabled general enabled 0 if [ $enabled -eq 0 ]; then $LOGGER service not enabled in /etc/config/$NAME - exit 1 + return 1 fi config_get_bool log_stderr general log_stderr 1 From b69ae7b9344228e1e83aaee2f62cebbd599c1388 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 8 Nov 2022 21:10:52 +0100 Subject: [PATCH 2/6] baresip: use return in init script "start_service()" is a function, hence "return" should be used instead of "exit". Signed-off-by: Sebastian Kemper --- net/baresip/files/baresip.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/baresip/files/baresip.init b/net/baresip/files/baresip.init index 72149be..d48e5d6 100644 --- a/net/baresip/files/baresip.init +++ b/net/baresip/files/baresip.init @@ -21,7 +21,7 @@ start_service() { if [ "$ENABLE_BARESIP" != yes ]; then $LOGGER User configuration incomplete - not starting $DAEMON $LOGGER Check ENABLE_BARESIP in $DEFAULT - exit 1 + return 1 fi procd_open_instance From ebfad751c7c2623128d7eb64cc89309e86e71eda Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 8 Nov 2022 21:12:48 +0100 Subject: [PATCH 3/6] coturn: use return in init script "start_service()" is a function, hence "return" should be used instead of "exit". Signed-off-by: Sebastian Kemper --- net/coturn/Makefile | 2 +- net/coturn/files/turnserver.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/coturn/Makefile b/net/coturn/Makefile index 728c482..850c95a 100644 --- a/net/coturn/Makefile +++ b/net/coturn/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coturn PKG_VERSION:=4.5.2 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/coturn/coturn/tar.gz/$(PKG_VERSION)? diff --git a/net/coturn/files/turnserver.init b/net/coturn/files/turnserver.init index 8f36d5a..73bf916 100755 --- a/net/coturn/files/turnserver.init +++ b/net/coturn/files/turnserver.init @@ -20,7 +20,7 @@ start_service() { config_get_bool enabled general enabled 0 if [ $enabled -eq 0 ]; then $LOG_ERR service not enabled in /etc/config/$NAME - exit 1 + return 1 fi config_get_bool log_stderr general log_stderr 1 From 9604a203d5b749e5ef17f5dcc6cfebbb4afeb7f6 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 8 Nov 2022 21:19:19 +0100 Subject: [PATCH 4/6] freeswitch: use return in init script "start_service()" is a function, hence "return" should be used instead of "exit". Signed-off-by: Sebastian Kemper --- net/freeswitch/files/freeswitch.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/freeswitch/files/freeswitch.init b/net/freeswitch/files/freeswitch.init index c390b9f..f2b0c9c 100644 --- a/net/freeswitch/files/freeswitch.init +++ b/net/freeswitch/files/freeswitch.init @@ -26,7 +26,7 @@ start_service() { config_get_bool enabled general enabled 0 if [ $enabled -eq 0 ]; then $LOG_ERR service not enabled in /etc/config/$NAME - exit 1 + return 1 fi config_get_bool log_stderr general log_stderr 1 @@ -46,7 +46,7 @@ start_service() { $LOG_INFO using procd\'s default term_timeout elif ! [ 0 -lt "$term_timeout" ] 2>/dev/null; then $LOG_ERR invalid term_timeout in /etc/config/$NAME - exit 1 + return 1 fi for i in "$dir_localstate" "$dir_run"; do From 2be80b04dd59a29de6e4a165936fb8dd927283c5 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 8 Nov 2022 22:01:01 +0100 Subject: [PATCH 5/6] kamailio: use return in init script "check_listen()" & "start_service()" are functions, hence "return" should be used instead of "exit". Signed-off-by: Sebastian Kemper --- net/kamailio/files/kamailio.init | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/kamailio/files/kamailio.init b/net/kamailio/files/kamailio.init index a796407..bf36507 100644 --- a/net/kamailio/files/kamailio.init +++ b/net/kamailio/files/kamailio.init @@ -26,7 +26,7 @@ check_listen() { [ -z "$value" ] && { $LOG_ERR empty $type entry - exit 1 + return 1 } # IPv6 addresses need to be enclosed in square brackets. If there are @@ -39,7 +39,7 @@ check_listen() { # Bail if more than 2 colons. [ $(echo "$value" | awk -F ":" '{print NF-1}') -gt 2 ] && { $LOG_ERR init script does not understand $type entry \""$value"\" - exit 1 + return 1 } IFS=":" read one two three << EOF @@ -93,7 +93,7 @@ start_service() { if [ $enabled -eq 0 ]; then $LOG_ERR service not enabled in /etc/config/$NAME - exit 1 + return 1 fi config_get user general user $NAME From e024681271be9e01bd267f4f1edfa48799517aff Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 8 Nov 2022 22:19:17 +0100 Subject: [PATCH 6/6] rtpproxy: use return in init script "check_ipaddr()" & "start_service()" are functions, hence "return" should be used instead of "exit". Signed-off-by: Sebastian Kemper --- net/rtpproxy/files/rtpproxy.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/rtpproxy/files/rtpproxy.init b/net/rtpproxy/files/rtpproxy.init index f71ec6a..4c94ba2 100644 --- a/net/rtpproxy/files/rtpproxy.init +++ b/net/rtpproxy/files/rtpproxy.init @@ -48,13 +48,13 @@ check_ipaddr() { [ -z "$value" ] && { $LOG_ERR empty $type entry - exit 1 + return 1 } # Bail if more than 1 slash. [ $(echo "$value" | awk -F "/" '{print NF-1}') -gt 1 ] && { $LOG_ERR init script does not understand $type entry \""$value"\" - exit 1 + return 1 } IFS="/" read one two << EOF