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>
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
index 76aad15..8cc310e 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
@@ -23,9 +23,9 @@
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