From patchwork Fri Aug 21 16:45:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Th=C3=A9baudeau?= X-Patchwork-Id: 509595 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id E81F6140773 for ; Sat, 22 Aug 2015 02:45:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3610691FC6; Fri, 21 Aug 2015 16:45:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rzlPNz7C1Syw; Fri, 21 Aug 2015 16:45:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5D80A91F70; Fri, 21 Aug 2015 16:45:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EECC31C1F7E for ; Fri, 21 Aug 2015 16:45:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id ED82295D3C for ; Fri, 21 Aug 2015 16:45:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Er8FMSpWJn3d for ; Fri, 21 Aug 2015 16:45:29 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from authsmtp.register.it (authsmtp75.register.it [195.110.101.59]) by hemlock.osuosl.org (Postfix) with ESMTP id E802C95D5E for ; Fri, 21 Aug 2015 16:45:28 +0000 (UTC) Received: from localhost.localdomain ([88.172.188.148]) by paganini31 with id 7UlM1r00T3CYkgw01UlUlZ; Fri, 21 Aug 2015 18:45:28 +0200 X-Rid: benoit@wsystem.com@88.172.188.148 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= To: buildroot@buildroot.org Date: Fri, 21 Aug 2015 18:45:19 +0200 Message-Id: <1440175519-478-9-git-send-email-benoit@wsystem.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1440175519-478-1-git-send-email-benoit@wsystem.com> References: <1440175519-478-1-git-send-email-benoit@wsystem.com> MIME-Version: 1.0 Cc: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Subject: [Buildroot] [PATCH v2 8/8] package/dhcp: SysV init scripts: refactor using functions X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Refactor these scripts using start()/stop() functions rather than having these scripts invoke themselves. By the way, clean up these scripts. Signed-off-by: Benoît Thébaudeau --- package/dhcp/S80dhcp-relay | 63 +++++++++++++++++++++----------------- package/dhcp/S80dhcp-server | 74 +++++++++++++++++++++++++-------------------- 2 files changed, 76 insertions(+), 61 deletions(-) diff --git a/package/dhcp/S80dhcp-relay b/package/dhcp/S80dhcp-relay index c6f7f0f..2f9ed50 100755 --- a/package/dhcp/S80dhcp-relay +++ b/package/dhcp/S80dhcp-relay @@ -1,61 +1,68 @@ #!/bin/sh -# -# $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $ -# + +NAME="dhcrelay" +DESC="DHCP relay" +DAEMON="/usr/sbin/${NAME}" + +# On what interfaces should the DHCP relay serve DHCP requests? +INTERFACES="" # What servers should the DHCP relay forward requests to? -# e.g: SERVERS="192.168.0.1" +# E.g: SERVERS="192.168.0.1" SERVERS="" -# On what interfaces should the DHCP relay (dhrelay) serve DHCP requests? -INTERFACES="" - # Additional options that are passed to the DHCP relay daemon? OPTIONS="" # Read configuration variable file if it is present -CFG_FILE="/etc/default/dhcrelay" +CFG_FILE="/etc/default/${NAME}" [ -r "${CFG_FILE}" ] && . "${CFG_FILE}" # PID files generated by the daemon -PID_FILES="/var/run/dhcrelay.pid /var/run/dhcrelay6.pid" +PID_FILES="/var/run/${NAME}.pid /var/run/${NAME}6.pid" # Sanity checks -test -f /usr/sbin/dhcrelay || exit 0 +test -f "${DAEMON}" || exit 0 test -n "$INTERFACES" || exit 0 test -n "$SERVERS" || exit 0 -# Build command line for interfaces (will be passed to dhrelay below.) +# Build command line for interfaces (will be passed to dhcrelay below). IFCMD="" for I in $INTERFACES; do IFCMD=${IFCMD}"-i "${I}" " done -DHCRELAYPID=/var/run/dhcrelay.pid +start() +{ + echo -n "Starting ${DESC}: " + start-stop-daemon -S -q -x "${DAEMON}" -- -q $OPTIONS $IFCMD $SERVERS && + echo "OK" || echo "FAIL" +} + +stop() +{ + echo -n "Stopping ${DESC}: " + if start-stop-daemon -K -q -x "${DAEMON}"; then + # This daemon does not remove its PID file when it exits. + rm -f ${PID_FILES} + echo "OK" + else + echo "FAIL" + fi +} case "$1" in start) - echo -n "Starting DHCP relay: " - start-stop-daemon -S -q -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS - [ $? = 0 ] && echo "OK" || echo "FAIL" + start ;; stop) - echo -n "Stopping DHCP relay: " - if start-stop-daemon -K -q -x /usr/sbin/dhcrelay; then - # This daemon does not remove its PID file when it exits. - rm -f ${PID_FILES} - echo "OK" - else - echo "FAIL" - fi + stop ;; - restart | force-reload) - $0 stop - $0 start + restart|force-reload) + stop + start ;; *) echo "Usage: $0 {start|stop|restart|force-reload}" exit 1 esac - -exit 0 diff --git a/package/dhcp/S80dhcp-server b/package/dhcp/S80dhcp-server index d3652b4..5b6e861 100755 --- a/package/dhcp/S80dhcp-server +++ b/package/dhcp/S80dhcp-server @@ -1,57 +1,65 @@ #!/bin/sh -# -# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $ -# -# On what interfaces should the DHCP server (dhcpd) serve DHCP requests? -# Separate multiple interfaces with spaces, e.g. "eth0 eth1". +NAME="dhcpd" +DESC="DHCP server" +DAEMON="/usr/sbin/${NAME}" +DAEMON_CONF="/etc/dhcp/${NAME}.conf" +DAEMON_LIB_DIR="/var/lib/dhcp" +LEASE_FILES="${DAEMON_LIB_DIR}/${NAME}.leases ${DAEMON_LIB_DIR}/${NAME}6.leases" + +# On what interfaces should the DHCP server serve DHCP requests? +# Separate multiple interfaces with spaces, e.g. "eth0 eth1". INTERFACES="" # Additional options that are passed to the DHCP server daemon? OPTIONS="" # Read configuration variable file if it is present -CFG_FILE="/etc/default/dhcpd" +CFG_FILE="/etc/default/${NAME}" [ -r "${CFG_FILE}" ] && . "${CFG_FILE}" # PID files generated by the daemon -PID_FILES="/var/run/dhcpd.pid /var/run/dhcpd6.pid" +PID_FILES="/var/run/${NAME}.pid /var/run/${NAME}6.pid" # Sanity checks -test -f /usr/sbin/dhcpd || exit 0 -test -f /etc/dhcp/dhcpd.conf || exit 0 +test -f "${DAEMON}" || exit 0 +test -f "${DAEMON_CONF}" || exit 0 + +start() +{ + echo -n "Starting ${DESC}: " + test -d "${DAEMON_LIB_DIR}" || mkdir -p "${DAEMON_LIB_DIR}" + for lease_file in ${LEASE_FILES}; do + test -f "${lease_file}" || touch "${lease_file}" + done + start-stop-daemon -S -q -x "${DAEMON}" -- -q $OPTIONS $INTERFACES && + echo "OK" || echo "FAIL" +} + +stop() +{ + echo -n "Stopping ${DESC}: " + if start-stop-daemon -K -q -x "${DAEMON}"; then + # This daemon does not remove its PID file when it exits. + rm -f ${PID_FILES} + echo "OK" + else + echo "FAIL" + fi +} case "$1" in start) - echo -n "Starting DHCP server: " - test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/ - for lease_file in /var/lib/dhcp/dhcpd.leases \ - /var/lib/dhcp/dhcpd6.leases; do - test -f "${lease_file}" || touch "${lease_file}" - done - start-stop-daemon -S -q -x /usr/sbin/dhcpd -- -q $OPTIONS $INTERFACES - [ $? = 0 ] && echo "OK" || echo "FAIL" + start ;; stop) - echo -n "Stopping DHCP server: " - if start-stop-daemon -K -q -x /usr/sbin/dhcpd; then - # This daemon does not remove its PID file when it exits. - rm -f ${PID_FILES} - echo "OK" - else - echo "FAIL" - fi + stop ;; - restart | force-reload) - $0 stop - $0 start - if [ "$?" != "0" ]; then - exit 1 - fi + restart|force-reload) + stop + start ;; *) echo "Usage: $0 {start|stop|restart|force-reload}" exit 1 esac - -exit 0