| commit | b5e69d65ee153205fec0419f2345a8063e77dde3 | [log] [tgz] |
|---|---|---|
| author | Matthew Barth <msbarth@us.ibm.com> | Tue Oct 24 14:04:46 2017 -0500 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Nov 10 16:41:07 2017 +0000 |
| tree | b6bad06d57830a50049c2ceed560d140fe739431 | |
| parent | bdeca3eb3cea455e9d899b241bab19c93efb5e44 [diff] |
Update fan init services Change the fan monitor and control init services to be wanted instead of required for the power on target. This allows the system to continue to power on if these were to fail. Change-Id: Ic3caf31f6fb1b8b4462f49e2733af3d6d8f686ad Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb index 79329b0..42368f7 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb +++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb
@@ -80,7 +80,7 @@ TMPL_CONTROL_INIT = "phosphor-fan-control-init@.service" INSTFMT_CONTROL_INIT = "phosphor-fan-control-init@{0}.service" -FMT_CONTROL_INIT = "../${TMPL_CONTROL_INIT}:${POWERON_TGT}.requires/${INSTFMT_CONTROL_INIT}" +FMT_CONTROL_INIT = "../${TMPL_CONTROL_INIT}:${POWERON_TGT}.wants/${INSTFMT_CONTROL_INIT}" FILES_${PN}-control = "${sbindir}/phosphor-fan-control" SYSTEMD_SERVICE_${PN}-control += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" @@ -105,7 +105,7 @@ TMPL_MONITOR_INIT = "phosphor-fan-monitor-init@.service" INSTFMT_MONITOR_INIT = "phosphor-fan-monitor-init@{0}.service" -FMT_MONITOR_INIT = "../${TMPL_MONITOR_INIT}:${POWERON_TGT}.requires/${INSTFMT_MONITOR_INIT}" +FMT_MONITOR_INIT = "../${TMPL_MONITOR_INIT}:${POWERON_TGT}.wants/${INSTFMT_MONITOR_INIT}" FILES_${PN}-monitor = "${sbindir}/phosphor-fan-monitor" SYSTEMD_SERVICE_${PN}-monitor += "${TMPL_MONITOR} ${TMPL_MONITOR_INIT}"
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service index d4dc280..b78457f 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service +++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service
@@ -10,4 +10,4 @@ SyslogIdentifier=phosphor-fan-control [Install] -RequiredBy=obmc-chassis-poweron@%i.target +WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service index a01acad..a5cfd85 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service +++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service
@@ -10,4 +10,4 @@ SyslogIdentifier=phosphor-fan-monitor [Install] -RequiredBy=obmc-chassis-poweron@%i.target +WantedBy=obmc-chassis-poweron@%i.target