Refactor action target names Host-shutdown-quiesce

The target change is:
obmc-stop-host -> obmc-host-shutdown
obmc-quiesce-host -> obmc-host-quiesce

Updated skeleton-rev.bbclass to have
correct commit id.

Change-Id: Ida47f8709622d98129c0fe00c86bad77d8d76dfb
Signed-off-by: Josh D. King <jdking@us.ibm.com>

8 files changed, 11 insertions, 10 deletions

diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass
index 5b5694c35..cbedb6b46 100644
--- a/meta-phosphor/classes/skeleton-rev.bbclass
+++ b/meta-phosphor/classes/skeleton-rev.bbclass
@@ -1,2 +1,2 @@
-SRCREV ?= "2a559546389d69b8505087f9ada92aaa1fec21b6"
+SRCREV ?= "e02cffd0ce0bbc10912d498a048c684bf6d5b3a9"
 SKELETON_URI ?= "git://github.com/openbmc/skeleton"
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
index cf8cb02b8..1d2c82568 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
@@ -30,11 +30,12 @@ CHASSIS_ACTION_TARGETS = "on off reset"
 HOST_SYNCH_TARGETS = "start-pre starting started stop-pre stopping stopped reset-running"
 
 # Track all host action targets
-# - start:   Service to run to start the host
-# - stop:    Services to run to shutdown the host
-# - quiesce: Target to enter on host boot failure
+# - start:    Service to run to start the host
+# - stop:     Services to run to shutdown the host
+# - quiesce:  Target to enter on host boot failure
+# - shutdown: Tell host to shutdown, then stop system
 # - reset:   Services to check if host is running and update host "start" target
-HOST_ACTION_TARGETS = "start stop quiesce reset"
+HOST_ACTION_TARGETS = "start stop quiesce reset shutdown"
 
 CHASSIS_SYNCH_FMT = "obmc-power-{0}@.target"
 CHASSIS_ACTION_FMT = "obmc-chassis-power{0}@.target"
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
index 9edb84453..21dfa6e49 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
@@ -1,5 +1,5 @@
 [Unit]
 Description=Host%i running after reset
-Conflicts=obmc-stop-host@%i.target
+Conflicts=obmc-host-shutdown@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
index 36994075e..d823d794f 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Host%i (Reset Check)
-Conflicts=obmc-stop-host%i.target
+Conflicts=obmc-host-shutdown%i.target
 RefuseManualStop=yes
 
 [Install]
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
index 9e7defe69..9e7defe69 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
index 317c6c14f..144b63387 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
@@ -6,5 +6,5 @@ Wants=mapper-wait@-org-openbmc-control-chassis%i.service
 After=mapper-wait@-org-openbmc-control-chassis%i.service
 Conflicts=obmc-host-stop@%i.target
 RefuseManualStop=yes
-OnFailure=obmc-quiesce-host@%i.target
+OnFailure=obmc-host-quiesce@%i.target
 OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
index 45d898bef..f1f7be14e 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
@@ -3,6 +3,6 @@ Description=Host%i (Started)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After=obmc-host-starting@%i.target
 Conflicts=obmc-host-stop@%i.target
-Conflicts=obmc-stop-host@%i.target
+Conflicts=obmc-host-shutdown@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service
index 64e0e3bd4..7c9a05c8f 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service
+++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service
@@ -7,7 +7,7 @@ Wants=obmc-host-reset-running@%i.target
 Before=obmc-host-reset-running@%i.target
 Wants=op-reset-chassis-on@%i.service
 After=op-reset-chassis-on@%i.service
-Conflicts=obmc-stop-host@%i.target
+Conflicts=obmc-host-shutdown@%i.target
 ConditionPathExists=/run/openbmc/chassis@%i-on
 
 [Service]