dhcp: read /etc/default/dhcpd, not /etc/default/dhcpd.conf

All daemons that read a file from /etc/default/ have it named just
after the name of daemon, without any extension. This commit fixes the
dhcp package to do the same.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/dhcp/S80dhcp-server b/package/dhcp/S80dhcp-server
index 356e73565a2082d191649c3316ff1e9ac5d3c535..06b7ab1d9f31440612ecae06305e37bf9781106e 100755 (executable)
--- a/package/dhcp/S80dhcp-server
+++ b/package/dhcp/S80dhcp-server
@@ -8,7 +8,7 @@
 INTERFACES=""
 
 # Allow a few customizations from a config file
-test -r /etc/default/dhcpd.conf && . /etc/default/dhcpd.conf
+test -r /etc/default/dhcpd && . /etc/default/dhcpd
 
 # Sanity checks
 test -f /usr/sbin/dhcpd || exit 0

diff --git a/package/dhcp/dhcpd.service b/package/dhcp/dhcpd.service
index d58fbd5d05979a95814ef85a76767daef0cf82f3..a05deb878f9f09f00a78755b7c4596f5d40ab3c8 100644 (file)
--- a/package/dhcp/dhcpd.service
+++ b/package/dhcp/dhcpd.service
@@ -7,7 +7,7 @@ Type=forking
 PIDFile=/run/dhcpd.pid
 ExecStart=/usr/sbin/dhcpd -q -pf /run/dhcpd.pid $INTERFACES
 KillSignal=SIGINT
-EnvironmentFile=-/etc/default/dhcpd.conf
+EnvironmentFile=-/etc/default/dhcpd
 
 [Install]
 WantedBy=multi-user.target