From 67db80d6a387c2677a55ab091abd6e26b715a4cf Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 15 May 2017 17:04:46 -0500 Subject: Conflict with host-stop target vs. host-shutdown The obmc-host-stop@.target will always be called on host shutdowns but the inverse is not always true. This commit ensures everything conflicts with the target that is always called in this path. Change-Id: Ic680ef96b1d6e2aec844a9c619928b7014fe7450 Signed-off-by: Andrew Geissler --- .../recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target | 2 +- .../common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target | 2 +- .../common/recipes-core/systemd/obmc-targets/obmc-host-started@.target | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'meta-phosphor/common/recipes-core') 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 21dfa6e49..94bb2b130 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-host-shutdown@%i.target +Conflicts=obmc-host-stop@%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 d823d794f..6ff68090c 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-host-shutdown%i.target +Conflicts=obmc-host-stop%i.target RefuseManualStop=yes [Install] 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 f1f7be14e..eb0a9383b 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,5 @@ Description=Host%i (Started) Wants={SYSTEMD_DEFAULT_TARGET} After=obmc-host-starting@%i.target Conflicts=obmc-host-stop@%i.target -Conflicts=obmc-host-shutdown@%i.target RefuseManualStart=yes RefuseManualStop=yes -- cgit v1.2.1