diff options
author | Timothy Pearson <tpearson@raptorengineering.com> | 2019-04-20 00:15:20 +0000 |
---|---|---|
committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-04-27 08:06:38 +0000 |
commit | baca278a4defec9fad89a057d41a87c2e5184fe6 (patch) | |
tree | 6f32c1a0f2bc43068b9c87385b27c9448e2ff096 /meta-rcs/meta-talos/recipes-phosphor/fans | |
parent | 813eacd1421d9dc0f0832718f3317a54658239d6 (diff) | |
download | talos-openbmc-baca278a4defec9fad89a057d41a87c2e5184fe6.tar.gz talos-openbmc-baca278a4defec9fad89a057d41a87c2e5184fe6.zip |
Update phosphor-fan overlay for latest OpenBMC sources
Diffstat (limited to 'meta-rcs/meta-talos/recipes-phosphor/fans')
-rw-r--r-- | meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend (renamed from meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend) | 0 | ||||
-rw-r--r-- | meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml (renamed from meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml) | 0 | ||||
-rw-r--r-- | meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service | 4 | ||||
-rw-r--r-- | meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend | 6 |
4 files changed, 6 insertions, 4 deletions
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend index 72d991c7e..72d991c7e 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml index 1e67ce56d..1e67ce56d 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service index 9a4f8df42..c1f5ae293 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service @@ -5,9 +5,11 @@ After=mapper-wait@-xyz-openbmc_project-inventory.service ConditionPathExists={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf [Service] +Type=oneshot +RemainAfterExit=yes EnvironmentFile={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf ExecStart=/usr/bin/env phosphor-cooling-type ${{OBJPATH}} ${{AIR}} ${{WATER}} ${{DEVICE}} ${{CODE}} SyslogIdentifier=phosphor-cooling-type [Install] -RequiredBy={SYSTEMD_DEFAULT_TARGET} +RequiredBy=multi-user.target diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend index 76aad1558..36751c29a 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -11,7 +11,7 @@ RDEPENDS_phosphor-cooling-type += "libevdev" TMPL_COOLING = "phosphor-cooling-type@.service" INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" -COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}" +COOLING_TGT = "multi-user.target" FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type" @@ -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 |