From 92dda042eb1ac184756858d3ba7db96a120733b9 Mon Sep 17 00:00:00 2001
From: Denis Silakov <denis.silakov@rosalab.ru>
Date: Wed, 25 Dec 2013 07:46:02 -0500
Subject: [PATCH] Fix tmpfiles creation

---
 dhcp.spec     | 9 ++++++---
 dhcpd.service | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dhcp.spec b/dhcp.spec
index 4f10fb7..ca8fadb 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -257,7 +257,8 @@ rm %{buildroot}%{_sysconfdir}/dhcpd.conf.example
 
 %post server
 %_post_service dhcpd
-%tmpfiles_create dhcpd
+/bin/systemd-tmpfiles --create dhcpd
+# %tmpfiles_create dhcpd
 # New dhcpd lease file
 if [ ! -f %{_localstatedir}/lib/dhcp/dhcpd.leases ]; then
     touch %{_localstatedir}/lib/dhcp/dhcpd.leases
@@ -268,13 +269,15 @@ fi
 
 %post relay
 %_post_service dhcrelay
-%tmpfiles_create dhcrelay
+/bin/systemd-tmpfiles --create dhcrelay
+# %tmpfiles_create dhcrelay
 
 %preun relay
 %_preun_service dhcrelay
 
 %post client
-%tmpfiles_create dhclient
+/bin/systemd-tmpfiles --create dhclient
+# %tmpfiles_create dhclient
 touch %{_localstatedir}/lib/dhclient/dhclient.leases
 
 %postun client
diff --git a/dhcpd.service b/dhcpd.service
index 44e277d..a705ca8 100644
--- a/dhcpd.service
+++ b/dhcpd.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 EnvironmentFile=/etc/sysconfig/dhcpd
-ExecStart=/usr/sbin/dhcpd -cf $CONFIGFILE -lf $LEASEFILE $INTERFACES
+ExecStart=/usr/sbin/dhcpd -cf $CONFIGFILE -lf $LEASEFILE $OPTIONS $INTERFACES
 
 [Install]
 WantedBy=multi-user.target