dhcp: misc improvements to S80dhcp-server

This commit does misc improvements to the S80dhcp-server init script:

 - Use more variables: NAME, DAEMON, CFG_FILE

 - Read the configuration file in /etc/default/ in a more usual way
   (as done in S21rngd for example)

 - Remove leftover dhcpd3 string in the stopping action.

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

diff --git a/package/dhcp/S80dhcp-server b/package/dhcp/S80dhcp-server
index 06b7ab1d9f31440612ecae06305e37bf9781106e..f52ca98dc0601304f3dec55c6de44eec65c33c51 100755 (executable)
--- a/package/dhcp/S80dhcp-server
+++ b/package/dhcp/S80dhcp-server
@@ -7,8 +7,12 @@
 #       Separate multiple interfaces with spaces, e.g. "eth0 eth1".
 INTERFACES=""
 
-# Allow a few customizations from a config file
-test -r /etc/default/dhcpd && . /etc/default/dhcpd
+NAME="dhcpd"
+DAEMON="/usr/sbin/${NAME}"
+CFG_FILE="/etc/default/${NAME}"
+
+# Read configuration variable file if it is present
+[ -r "${CFG_FILE}" ] && . "${CFG_FILE}"
 
 # Sanity checks
 test -f /usr/sbin/dhcpd || exit 0
@@ -20,12 +24,12 @@ case "$1" in
                printf "Starting DHCP server: "
                test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
                test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases
-               start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES
+               start-stop-daemon -S -x ${DAEMON} -- -q $INTERFACES
                [ $? = 0 ] && echo "OK" || echo "FAIL"
                ;;
        stop)
-               printf "Stopping DHCP server: dhcpd3"
-               start-stop-daemon -K -x /usr/sbin/dhcpd
+               printf "Stopping DHCP server: "
+               start-stop-daemon -K -x ${DAEMON}
                [ $? = 0 ] && echo "OK" || echo "FAIL"
                ;;
        restart | force-reload)