353fd02a0f
* Mostly a packaging-only clean-up, as we had backported most
important changes already.
* lm_sensors-r6111-detection-Winbond-W83627SF.diff,
lm_sensors-r6112-detection-AMD-family-16h.diff,
lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff,
lm_sensors-r6117-detection-ITE-IT8752F.diff,
lm_sensors-r6123-AnalogDev-ADT7410-driver.diff,
lm_sensors-r6163-pwmconfig-raise-threshold.diff,
lm_sensors-r6164-pwmconfig-drop-comment.diff,
lm_sensors-r6165-pwmconfig-multiple-fans.diff,
lm_sensors-r6172-fancontrol-absolute-paths.diff: Removed,
upstream now.
* fancontrol.service: Removed, now provided by upstream,
together with sensord.service.
* lm_sensors-3.0.0-sysconfig_metadata.patch,
lm_sensors-3.0.3-hint-at-kernel-extra-package.patch: Refreshed.
- lm_sensors-r6181-fix-service-files.patch: Fix EnvironmentFile
in service files
OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=63
32 lines
901 B
Diff
32 lines
901 B
Diff
Subject: Fix EnvironmentFile in service files
|
|
Upstream: yes, r6181
|
|
|
|
* EnvironmentFile is mandatory for sensord.
|
|
* fancontrol needs no EnvironmentFile.
|
|
---
|
|
prog/init/fancontrol.service | 1 -
|
|
prog/init/sensord.service | 2 +-
|
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/prog/init/fancontrol.service
|
|
+++ b/prog/init/fancontrol.service
|
|
@@ -4,7 +4,6 @@ ConditionFileNotEmpty=/etc/fancontrol
|
|
After=lm_sensors.service
|
|
|
|
[Service]
|
|
-EnvironmentFile=/etc/sysconfig/lm_sensors
|
|
Type=simple
|
|
PIDFile=/var/run/fancontrol.pid
|
|
ExecStart=/usr/sbin/fancontrol
|
|
--- a/prog/init/sensord.service
|
|
+++ b/prog/init/sensord.service
|
|
@@ -4,7 +4,7 @@ After=lm_sensors.service
|
|
After=syslog.target
|
|
|
|
[Service]
|
|
-EnvironmentFile=-/etc/sysconfig/sensord
|
|
+EnvironmentFile=/etc/sysconfig/sensord
|
|
Type=forking
|
|
PIDFile=/var/run/sensord.pid
|
|
ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon
|