diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2018-05-03 00:06:36 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-05-04 16:45:59 +0300 |
| commit | afd4941577e27a702d0d1edd5221554e4a454c4d (patch) | |
| tree | e0669ab76c726edcccae3a0e22c7c809080eab4d /meta-openbmc-machines | |
| parent | d03dd4f0e1724d7bd250c56f909e35bf11dd9b0c (diff) | |
| download | openbmc-afd4941577e27a702d0d1edd5221554e4a454c4d.tar.xz | |
wspoon: Fixup watchdog monitor config on fan apps
The phoshor-fan-monitor-init and phosphor-fan-control-init
package names that the SYSTEMD_OVERRIDE directives were given
don't actually exist, as those apps are just part of the
phosphor-fan-control and phosphor-fan-monitor packages.
Fixup these directives so the fan watchdog configuration is
used for these services which means if they fail the fan
watchdog will trip as desired.
Tested: Check that phosphor-fan-control-init@0.service.d and
phosphor-fan-monitor-init@0.service.d now show up, and killed
fan-control-init and watched that the watchdog triggered.
Change-Id: I1786891ec5da7045b4f0a9f72d5ae29f454fa9a0
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend index 76aad1558..8cc310e7c 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend @@ -23,9 +23,9 @@ COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" #These services are protected by the watchdog -SYSTEMD_OVERRIDE_phosphor-fan-control-init += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor-init += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" #These services need to be stopped when watchdog expires |