Merge pull request #8 from stephenxs/pmon-dependency-syncd-defer-pmon…

…-start [syncd.sh,pmon.service] Prevent pmon from starting ahead of syncd
stephenxs · Sep 19, 2019 · d5376e3 · d5376e3
2 parents 226039c + 62509b6
commit d5376e3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/files/build_templates/pmon.service.j2 b/files/build_templates/pmon.service.j2
@@ -2,6 +2,9 @@
 Description=Platform monitor container
 Requires=updategraph.service
 After=updategraph.service
+{% if sonic_asic_platform == 'mellanox' %}
+After=syncd.service
+{% endif %}
 Before=ntp-config.service
 
 [Service]

diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
@@ -109,10 +109,6 @@ start() {
             /usr/bin/hw-management.sh chipdown
         fi
 
-        debug "Starting pmon service..."
-        /bin/systemctl start pmon
-        debug "Started pmon service"
-
         if [[ x"$BOOT_TYPE" == x"fast" ]]; then
             /usr/bin/hw-management.sh chipupdis
         fi
@@ -136,6 +132,11 @@ start() {
 }
 
 wait() {
+    if [[ x"$sonic_asic_platform" == x"mellanox" ]]; then
+        debug "Starting pmon service..."
+        /bin/systemctl start pmon
+        debug "Started pmon service"
+    fi
     /usr/bin/${SERVICE}.sh wait
 }