From e8a1a29ed83daec5f3ff6af84a897bbe0cf49d93 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pzhukov@redhat.com>
Date: Apr 04 2017 13:02:44 +0000
Subject: Add EnvironmentFile parameter to service files


---

diff --git a/dhcp.spec b/dhcp.spec
index 831202e..3af7a20 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -19,7 +19,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.5
-Release:  3%{?dist}
+Release:  4%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -662,6 +662,9 @@ done
 %doc doc/html/
 
 %changelog
+* Tue Apr 04 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 12:4.3.5-4
+- Add EnvironmentFile parameter for backward compatibility
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 12:4.3.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/dhcpd.service b/dhcpd.service
index ce0740f..7363d7d 100644
--- a/dhcpd.service
+++ b/dhcpd.service
@@ -7,7 +7,8 @@ After=time-sync.target
 
 [Service]
 Type=notify
-ExecStart=/usr/sbin/dhcpd -f -cf /etc/dhcp/dhcpd.conf -user dhcpd -group dhcpd --no-pid
+EnvironmentFile=-/etc/sysconfig/dhcpd
+ExecStart=/usr/sbin/dhcpd -f -cf /etc/dhcp/dhcpd.conf -user dhcpd -group dhcpd --no-pid $DHCPDARGS
 StandardError=null
 
 [Install]
diff --git a/dhcpd6.service b/dhcpd6.service
index 5927e14..ff844c0 100644
--- a/dhcpd6.service
+++ b/dhcpd6.service
@@ -7,7 +7,8 @@ After=time-sync.target
 
 [Service]
 Type=notify
-ExecStart=/usr/sbin/dhcpd -f -6 -cf /etc/dhcp/dhcpd6.conf -user dhcpd -group dhcpd --no-pid
+EnvironmentFile=-/etc/sysconfig/dhcpd6
+ExecStart=/usr/sbin/dhcpd -f -6 -cf /etc/dhcp/dhcpd6.conf -user dhcpd -group dhcpd --no-pid $DHCPDARGS
 StandardError=null
 
 [Install]