meta-facebook: harma: modify graceful shutdown behavior

Add a power status condition check. If a graceful shutdown is performed
but the power is still on, we will proceed with a force shutdown.

Change-Id: Ife33a9b4171f670df979148e105e58adb4f7070b
Signed-off-by: Peter Yin <peter.yin@quantatw.com>
diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/power-cmd b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/power-cmd
index d9a224b..9587dce 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/power-cmd
+++ b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/power-cmd
@@ -12,7 +12,17 @@
     fi
 }
 
-# DC off
+# Force DC off
+force_power_off() {
+    if [ "$(power_status)" == "on" ]; then
+        set_gpio power-host-control 0
+        sleep 6
+        set_gpio power-host-control 1
+        sleep 1
+    fi
+}
+
+# Graceful DC off
 graceful_power_off() {
     if [ "$(power_status)" == "on" ]; then
         set_gpio power-host-control 0
@@ -22,16 +32,9 @@
 
         # wait host power off
         sleep 10
-    fi
-}
-
-# DC off
-force_power_off() {
-    if [ "$(power_status)" == "on" ]; then
-        set_gpio power-host-control 0
-        sleep 6
-        set_gpio power-host-control 1
-        sleep 1
+        if [ "$(power_status)" == "on" ]; then
+            force_power_off
+        fi
     fi
 }