matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[docker-pmon] Fix copy of fancontrol config file (#5037)

Browse Source 
Copy proper fancontrol config file to the proper destination. Also some minor refactoring for code reuse to help prevent issues like this in the future.

Fixes a bug introduced by #4599
This commit is contained in:
Joe LeVeque 2020-07-28 00:23:21 -07:00 committed by GitHub
parent ddf9fdde72
commit 2600747f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dockers/docker-platform-monitor/docker_init.sh
View File

@ -3,15 +3,17 @@
# Generate supervisord config file and the start.sh scripts # Generate supervisord config file and the start.sh scripts
mkdir -p /etc/supervisor/conf.d/ mkdir -p /etc/supervisor/conf.d/
SENSORS_CONF_FILE="/usr/share/sonic/platform/sensors.conf"
FANCONTROL_CONF_FILE="/usr/share/sonic/platform/fancontrol"
HAVE_SENSORS_CONF=0 HAVE_SENSORS_CONF=0
HAVE_FANCONTROL_CONF=0 HAVE_FANCONTROL_CONF=0
if [ -e /usr/share/sonic/platform/sensors.conf ]; then if [ -e $SENSORS_CONF_FILE ]; then
HAVE_SENSORS_CONF=1 HAVE_SENSORS_CONF=1
fi fi
if [ -e /usr/share/sonic/platform/fancontrol ]; then if [ -e $FANCONTROL_CONF_FILE ]; then
HAVE_FANCONTROL_CONF=1 HAVE_FANCONTROL_CONF=1
fi fi
@ -24,19 +26,18 @@ else
sonic-cfggen -a "$confvar" -t /usr/share/sonic/templates/docker-pmon.supervisord.conf.j2 > /etc/supervisor/conf.d/supervisord.conf sonic-cfggen -a "$confvar" -t /usr/share/sonic/templates/docker-pmon.supervisord.conf.j2 > /etc/supervisor/conf.d/supervisord.conf
fi fi
# If this platform has an lm-sensors config file, copy it to it's proper place. # If this platform has an lm-sensors config file, copy it to its proper place
if [ -e /usr/share/sonic/platform/sensors.conf ]; then if [ $HAVE_SENSORS_CONF -eq 1 ]; then
mkdir -p /etc/sensors.d mkdir -p /etc/sensors.d
/bin/cp -f /usr/share/sonic/platform/sensors.conf /etc/sensors.d/ /bin/cp -f $SENSORS_CONF_FILE /etc/sensors.d/
fi fi
# If this platform has a fancontrol config file, copy it to it's proper place # If this platform has a fancontrol config file, copy it to its proper place
# and start fancontrol if [ $HAVE_FANCONTROL_CONF -eq 1 ]; then
if [ -e /usr/share/sonic/platform/fancontrol ]; then
# Remove stale pid file if it exists # Remove stale pid file if it exists
rm -f /var/run/fancontrol.pid rm -f /var/run/fancontrol.pid
/bin/cp -f /usr/share/sonic/templates/fancontrol.conf /etc/supervisord/conf.d/ /bin/cp -f $FANCONTROL_CONF_FILE /etc/
fi fi
exec /usr/bin/supervisord exec /usr/bin/supervisord