0a70571011
Backport thermal control feature from master branch to 201911 branch by cherry-picking commits and manually resolving conflicts.
28 lines
822 B
Diff
28 lines
822 B
Diff
From 3512488c981eb81d51ce92cb3573721e36861f56 Mon Sep 17 00:00:00 2001
|
|
From: Junchao Chen <junchao@mellanox.com>
|
|
Date: Fri, 29 May 2020 10:38:53 +0300
|
|
Subject: [PATCH] Disable hw-management thermal control service
|
|
|
|
---
|
|
usr/usr/bin/hw-management.sh | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
|
|
index 65e5d39..0d1c4a1 100755
|
|
--- a/usr/usr/bin/hw-management.sh
|
|
+++ b/usr/usr/bin/hw-management.sh
|
|
@@ -832,7 +832,9 @@ do_start()
|
|
if [ -f $config_path/max_tachos ]; then
|
|
max_tachos=$(<$config_path/max_tachos)
|
|
fi
|
|
- $THERMAL_CONTROL $thermal_type $max_tachos $max_psus&
|
|
+ # Disable hw-management thermal control because
|
|
+ # SONiC already implement it
|
|
+ #$THERMAL_CONTROL $thermal_type $max_tachos $max_psus&
|
|
}
|
|
|
|
do_stop()
|
|
--
|
|
1.9.1
|
|
|