diff options
author | Matt Spinler <spinler@us.ibm.com> | 2018-06-29 14:01:00 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-07-11 22:04:17 +0000 |
commit | 443a4d6e0f0a208858f77cb486a10fcb32efd9e1 (patch) | |
tree | a40b00045e34a61139052687595366daa0fac6cc | |
parent | e9248ec647a2dcd99d0d2d74c54ec7654a97bff2 (diff) | |
download | talos-openbmc-443a4d6e0f0a208858f77cb486a10fcb32efd9e1.tar.gz talos-openbmc-443a4d6e0f0a208858f77cb486a10fcb32efd9e1.zip |
Fix typos in some targets
Tested: Performed system boots and reboots.
Change-Id: I1052cb4cd86a5815df1f1021a37f539184078d82
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
6 files changed, 5 insertions, 6 deletions
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target index 6d72d8772..48fc44169 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target @@ -5,7 +5,7 @@ After={SYSTEMD_DEFAULT_TARGET} Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-chassis-reset@%i.target +Conflicts=obmc-chassis-powerreset@%i.target Conflicts=obmc-host-shutdown@%i.target Conflicts=xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target index 1a042a0b8..84c1ddab1 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target @@ -5,5 +5,5 @@ After={SYSTEMD_DEFAULT_TARGET} Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-chassis-reset@%i.target +Conflicts=obmc-chassis-powerreset@%i.target RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target index bf775fd7b..080d72456 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target @@ -5,5 +5,5 @@ After={SYSTEMD_DEFAULT_TARGET} Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-chassis-reset@%i.target +Conflicts=obmc-chassis-powerreset@%i.target RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target index 2ef6c7053..8d7c47e6b 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target @@ -1,6 +1,6 @@ [Unit] Description=Chassis%i (Reset Check) -Conflicts=obmc-chassis-poweroff%i.target +Conflicts=obmc-chassis-poweroff@%i.target RefuseManualStop=yes [Install] 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 6ff68090c..ca95d843c 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-stop%i.target +Conflicts=obmc-host-stop@%i.target RefuseManualStop=yes [Install] diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target index 51bce8db5..408139dd4 100644 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target +++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target @@ -3,6 +3,5 @@ Description=Host%i (Starting) Wants={SYSTEMD_DEFAULT_TARGET} After=obmc-host-start-pre@%i.target Conflicts=obmc-host-stop@%i.target -Conflicts=obmc-stop-host@%i.target RefuseManualStart=yes RefuseManualStop=yes |