| commit | d364014caf0f54f1fe1f8c591056ba7b01db4fdf | [log] [tgz] |
|---|---|---|
| author | Andrew Geissler <andrewg@us.ibm.com> | Wed Mar 22 15:03:08 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Sat Mar 25 01:51:25 2017 +0000 |
| tree | 04ebd3d757c24f251c615ce11f36b4f501028674 | |
| parent | cb147293e8743086028e7cf93614d08c95b529f4 [diff] |
Do not run host start targets if host already on This is the first commit in a series that will ensure we do not run the host start services when the host is already running. Specifically this is to handle the situation where the host is running and the BMC is rebooted. Change-Id: I6c6a99a3c2aefff338c2eafe546a525999c357b4 Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service index 20a2938..14f816e 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/start_host@.service
@@ -7,6 +7,7 @@ Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target Conflicts=obmc-chassis-stop@%i.target +ConditionPathExists=!/run/openbmc/host@%i-on [Service] ExecStart={sbindir}/openpower-proc-control startHost
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service index 7178d93..d28bfe8 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
@@ -5,6 +5,7 @@ Wants=mapper-wait@-org-openbmc-watchdog-host%i.service After=mapper-wait@-org-openbmc-watchdog-host%i.service Conflicts=obmc-chassis-stop@%i.target +ConditionPathExists=!/run/openbmc/host@%i-on [Service] Type=oneshot
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service index 6445155..8c5cfbb 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
@@ -9,6 +9,7 @@ Wants=mapper-wait@-org-openbmc-control-host%i.service After=mapper-wait@-org-openbmc-control-host%i.service Conflicts=obmc-chassis-stop@%i.target +ConditionPathExists=!/run/openbmc/host@%i-on [Service] Type=oneshot