From 2dec06a2a94fe64d05778840dce124d5a9a056e7 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 3 Jun 2013 12:36:47 +0000
Subject: [PATCH] Fix EnvironmentFile in service files

* EnvironmentFile is mandatory for sensord.
* fancontrol needs no EnvironmentFile.
---
 CHANGES                      | 1 +
 prog/init/fancontrol.service | 1 -
 prog/init/sensord.service    | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4d9c984a..dd4160aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ lm-sensors CHANGES file
 -----------------------
 
 SVN HEAD
+  init: Fix EnvironmentFile in service files
   sensors-detect: Report built-in drivers as such
 
 3.3.4 (2013-05-27)
diff --git a/prog/init/fancontrol.service b/prog/init/fancontrol.service
index c70899d2..3ac1ed02 100644
--- 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
diff --git a/prog/init/sensord.service b/prog/init/sensord.service
index 173e34a9..47fcab29 100644
--- 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