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>
diff --git a/classes/skeleton-rev.bbclass b/classes/skeleton-rev.bbclass
index 5b5694c..cbedb6b 100644
--- a/classes/skeleton-rev.bbclass
+++ b/classes/skeleton-rev.bbclass
@@ -1,2 +1,2 @@
-SRCREV ?= "2a559546389d69b8505087f9ada92aaa1fec21b6"
+SRCREV ?= "e02cffd0ce0bbc10912d498a048c684bf6d5b3a9"
SKELETON_URI ?= "git://github.com/openbmc/skeleton"
diff --git a/common/recipes-core/systemd/obmc-targets.bb b/common/recipes-core/systemd/obmc-targets.bb
index cf8cb02..1d2c825 100644
--- a/common/recipes-core/systemd/obmc-targets.bb
+++ b/common/recipes-core/systemd/obmc-targets.bb
@@ -30,11 +30,12 @@
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/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
index 9edb844..21dfa6e 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
+++ b/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/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
index 3699407..d823d79 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
+++ b/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/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
similarity index 100%
rename from common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
rename to common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
index 317c6c1..144b633 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
@@ -6,5 +6,5 @@
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/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
index 45d898b..f1f7be1 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
@@ -3,6 +3,6 @@
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/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service b/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service
index 64e0e3b..7c9a05c 100644
--- a/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service
+++ b/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service
@@ -7,7 +7,7 @@
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]