From 8a0859500611a8d7e4c69ccea8dd4104fd0c4700 Mon Sep 17 00:00:00 2001 From: Kebo Liu Date: Wed, 19 Jun 2019 02:02:24 +0800 Subject: [PATCH] [Pmon] Add new daemon "syseepromd" to pmon docker (#2866) --- .../docker-pmon.supervisord.conf.j2 | 11 +++++++++++ dockers/docker-platform-monitor/start.sh.j2 | 5 +++++ rules/docker-platform-monitor.mk | 2 +- rules/sonic-syseepromd.mk | 5 +++++ src/sonic-platform-daemons | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 rules/sonic-syseepromd.mk diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 index a10b94c25e..c6a571da93 100644 --- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 +++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 @@ -69,3 +69,14 @@ stdout_logfile=syslog stderr_logfile=syslog startsecs=0 {% endif %} + +{% if not skip_syseepromd %} +[program:syseepromd] +command=/usr/bin/syseepromd +priority=8 +autostart=false +autorestart=true +stdout_logfile=syslog +stderr_logfile=syslog +startsecs=0 +{% endif %} diff --git a/dockers/docker-platform-monitor/start.sh.j2 b/dockers/docker-platform-monitor/start.sh.j2 index e9f0ebf6cd..3520ba5894 100644 --- a/dockers/docker-platform-monitor/start.sh.j2 +++ b/dockers/docker-platform-monitor/start.sh.j2 @@ -48,3 +48,8 @@ supervisorctl start xcvrd {% if not skip_psud %} supervisorctl start psud {% endif %} + +{% if not skip_syseepromd %} +supervisorctl start syseepromd +{% endif %} + diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk index e18cda705d..7f1f4022e4 100644 --- a/rules/docker-platform-monitor.mk +++ b/rules/docker-platform-monitor.mk @@ -7,7 +7,7 @@ DOCKER_PLATFORM_MONITOR_DBG = $(DOCKER_PLATFORM_MONITOR_STEM)-$(DBG_IMAGE_MARK). $(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/$(DOCKER_PLATFORM_MONITOR_STEM) $(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(SMARTMONTOOLS) -$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD) +$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD) $(SONIC_SYSEEPROMD) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2) $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2) diff --git a/rules/sonic-syseepromd.mk b/rules/sonic-syseepromd.mk new file mode 100644 index 0000000000..8f7a6e5e90 --- /dev/null +++ b/rules/sonic-syseepromd.mk @@ -0,0 +1,5 @@ +# sonic-syseepromd (SONiC Syseeprom gathering daemon) Debian package + +SONIC_SYSEEPROMD = python-sonic-syseepromd_1.0-1_all.deb +$(SONIC_SYSEEPROMD)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-syseepromd +SONIC_PYTHON_STDEB_DEBS += $(SONIC_SYSEEPROMD) diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index 366ac0e3dd..84bca6465b 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 366ac0e3dd92be276217be2432f3170312cf50da +Subproject commit 84bca6465b5d089bb40fb47d7c4006b7558e1091