From f84c374a16ca8a386e57a09f319685f7d859f9f0 Mon Sep 17 00:00:00 2001 From: Markus Gothe Date: Tue, 21 Jan 2025 17:56:11 +0100 Subject: [PATCH] mcastmngr: Make sure we don't crash during boot up. Avoid polluting the syslog with messages regarding mcastmngr crashing: procd: Instance mcast::instance1 s in a crash loop 6 crashes, 0 seconds since last crash --- mcastmngr/files/broadcom/lib/mcast/broadcom.sh | 4 ++++ mcastmngr/files/common/etc/init.d/mcast | 4 ++++ mcastmngr/files/linux/lib/mcast/linux.sh | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/mcastmngr/files/broadcom/lib/mcast/broadcom.sh b/mcastmngr/files/broadcom/lib/mcast/broadcom.sh index be7f83135..f449ff229 100755 --- a/mcastmngr/files/broadcom/lib/mcast/broadcom.sh +++ b/mcastmngr/files/broadcom/lib/mcast/broadcom.sh @@ -251,3 +251,7 @@ configure_mcast() { configure_mcpd } + +validate_params() { + return 0 +} diff --git a/mcastmngr/files/common/etc/init.d/mcast b/mcastmngr/files/common/etc/init.d/mcast index 04eaff13f..caef92e84 100755 --- a/mcastmngr/files/common/etc/init.d/mcast +++ b/mcastmngr/files/common/etc/init.d/mcast @@ -33,6 +33,10 @@ start_service() { configure_mcast fi + if ! validate_params; then + return + fi + if [ -z "${PROG_PARAMS}" ]; then start_mcast_service else diff --git a/mcastmngr/files/linux/lib/mcast/linux.sh b/mcastmngr/files/linux/lib/mcast/linux.sh index 273399859..0a5327456 100755 --- a/mcastmngr/files/linux/lib/mcast/linux.sh +++ b/mcastmngr/files/linux/lib/mcast/linux.sh @@ -425,3 +425,9 @@ configure_mcast() { read_mcast_proxy_params config_mcproxy } + +validate_params() { + [ -n "${PROG_PARAMS}" ] && return 0 + + return 1 +}