meta-ibm: set critical services for IBM systems

This takes the default critical services list from meta-phosphor and
appends on extra services IBM is interested in.

Ideally, there would be an easy way to just append an extra file to the
command line but this is going to need some more thought. For now, just
override the entire file.

Tested:
- Booted witherspoon up in QEMU and verified new json file was loaded
  and that stopping one of the new critical services resulted in a
  dump, error log, and BMC Quiesced state.

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Icf5db5331072cbcbd0359e0b789b664e31423124

2 files changed, 54 insertions, 0 deletions

diff --git a/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json b/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json
new file mode 100644
index 0000000000..d2c9be6bf1
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/state/phosphor-state-manager/phosphor-service-monitor-default.json
@@ -0,0 +1,45 @@
+{
+    "services" : [
+        "xyz.openbmc_project.biosconfig_manager.service",
+        "xyz.openbmc_project.Dump.Manager.service",
+        "xyz.openbmc_project.EntityManager.service",
+        "xyz.openbmc_project.hwmontempsensor.service",
+        "xyz.openbmc_project.Inventory.Manager.service",
+        "xyz.openbmc_project.Logging.service",
+        "xyz.openbmc_project.Network.service",
+        "xyz.openbmc_project.nvmesensor.service",
+        "xyz.openbmc_project.ObjectMapper.service",
+        "xyz.openbmc_project.Settings.service",
+        "xyz.openbmc_project.Software.BMC.Updater.service",
+        "xyz.openbmc_project.Software.Download.service",
+        "xyz.openbmc_project.Software.Version.service",
+        "xyz.openbmc_project.State.BMC.service",
+        "xyz.openbmc_project.State.Chassis.service",
+        "xyz.openbmc_project.State.Host.service",
+        "xyz.openbmc_project.Time.Manager.service",
+        "xyz.openbmc_project.User.Manager.service",
+        "bmcweb.service",
+        "attn_handler.service",
+        "bmc-acf-manager.service",
+        "bmc-vmi-ca-manager.service",
+        "com.ibm.panel.service",
+        "com.ibm.VPD.Manager.service",
+        "mctp-demux.service",
+        "org.open_power.OCC.Control.service",
+        "org.open_power.Dump.Manager.service",
+        "org.open_power.HardwareIsolation.service",
+        "org.openbmc.HostIpmi.service",
+        "phosphor-fan-control@0.service",
+        "phosphor-fan-monitor@0.service",
+        "phosphor-fan-presence-tach@0.service",
+        "phosphor-ipmi-net@eth0.service",
+        "phosphor-ipmi-net@eth1.service",
+        "phosphor-power-control.service",
+        "phosphor-psu-monitor.service",
+        "phosphor-regulators.service",
+        "phosphor-virtual-sensor.service",
+        "pldmd.service",
+        "sensor-monitor.service ",
+        "system-vpd.service"
+    ]
+}
diff --git a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 089d04cc9c..71739b3f65 100644
--- a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -14,3 +14,12 @@ RRECOMMENDS:${PN}-host += "${PN}-hypervisor"
 # system power on if chassis power is in a bad state
 RRECOMMENDS:${PN}-chassis = "${PN}-chassis-check-power-status"
 
+# Override critical services to monitor with IBM file
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+FILES:${PN}-bmc:append = " ${sysconfdir}/phosphor-service-monitor-default.json"
+SRC_URI:append = " file://phosphor-service-monitor-default.json"
+do_install:append() {
+    install -d ${D}${sysconfdir}/phosphor-systemd-target-monitor
+    install -m 0644 ${WORKDIR}/phosphor-service-monitor-default.json \
+        ${D}${sysconfdir}/phosphor-systemd-target-monitor/
+}