diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-12-24 14:48:28 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-12-24 14:48:28 +0100 |
| commit | 6f81baaf47e3f47b131ec2b1c6c5f7d062a48d84 (patch) | |
| tree | 698f299a6e0ca3b8d115d5688a9eda22a961a35f /package/dhcp | |
| parent | c4486e8c947e728b663eb2ac1c0286077129445f (diff) | |
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>
Diffstat (limited to 'package/dhcp')
| -rwxr-xr-x | package/dhcp/S80dhcp-server | 2 | ||||
| -rw-r--r-- | package/dhcp/dhcpd.service | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/dhcp/S80dhcp-server b/package/dhcp/S80dhcp-server index 356e73565..06b7ab1d9 100755 --- 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 d58fbd5d0..a05deb878 100644 --- 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 |