diff --git a/dockers/docker-fpm/start.sh b/dockers/docker-fpm/start.sh index 90a1d515fa..9916d675a2 100755 --- a/dockers/docker-fpm/start.sh +++ b/dockers/docker-fpm/start.sh @@ -1,5 +1,16 @@ #!/bin/bash +function clean_up { + pkill -9 fpmsyncd + service quagga stop + service rsyslog stop + exit +} + +trap clean_up SIGTERM SIGKILL + +# Remove rsyslogd pid file if it exists +[ -e RSYSLOGD_PIDFILE ] && rm RSYSLOGD_PIDFILE service rsyslog start service quagga start fpmsyncd & diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh index fe9528d99b..d7c9a8c441 100755 --- a/dockers/docker-orchagent/start.sh +++ b/dockers/docker-orchagent/start.sh @@ -40,6 +40,8 @@ elif [ "$onie_platform" == "x86_64-accton_as7512_32x-r0" ]; then PORTSYNCD_ARGS+="-p /etc/ssw/AS7512/port_config.ini" fi +# Remove rsyslogd pid file if it exists +[ -e /var/run/rsyslogd.pid ] && rm /var/run/rsyslogd.pid service rsyslog start while true; do diff --git a/dockers/docker-syncd-mlnx/start.sh b/dockers/docker-syncd-mlnx/start.sh index 63dbc8bfb2..348edf0e06 100755 --- a/dockers/docker-syncd-mlnx/start.sh +++ b/dockers/docker-syncd-mlnx/start.sh @@ -12,6 +12,8 @@ trap clean_up SIGTERM SIGKILL # occures . mlnx-fw-upgrade.sh +# Remove rsyslogd pid file if it exists +[ -e /var/run/rsyslogd.pid ] && rm /var/run/rsyslogd.pid service rsyslog start service syncd start diff --git a/dockers/docker-syncd/start.sh b/dockers/docker-syncd/start.sh index 3e5b941a76..d2ca568d7c 100755 --- a/dockers/docker-syncd/start.sh +++ b/dockers/docker-syncd/start.sh @@ -8,6 +8,8 @@ function clean_up { trap clean_up SIGTERM SIGKILL +# Remove rsyslogd pid file if it exists +[ -e /var/run/rsyslogd.pid ] && rm /var/run/rsyslogd.pid service rsyslog start service syncd start diff --git a/dockers/docker-team/start.sh b/dockers/docker-team/start.sh index 61251cd82d..a1b00b9250 100755 --- a/dockers/docker-team/start.sh +++ b/dockers/docker-team/start.sh @@ -11,6 +11,8 @@ function clean_up { trap clean_up SIGTERM SIGKILL +# Remove rsyslogd pid file if it exists +[ -e /var/run/rsyslogd.pid ] && rm /var/run/rsyslogd.pid service rsyslog start if [ -d $TEAMD_CONF_PATH ]; then