From patchwork Sun Oct 25 00:59:29 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: 535516 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id B181D14131D for ; Sun, 25 Oct 2015 12:00:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=PvsI80vw; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CCC3131B48; Sun, 25 Oct 2015 01:00:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f8Rq4yp2r6EU; Sun, 25 Oct 2015 01:00:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id DEED430B33; Sun, 25 Oct 2015 00:59:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 20C091C0BE0 for ; Sun, 25 Oct 2015 00:59:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1C39430B33 for ; Sun, 25 Oct 2015 00:59:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DP6JvhyTlCpE for ; Sun, 25 Oct 2015 00:59:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by silver.osuosl.org (Postfix) with ESMTPS id E138D248A1 for ; Sun, 25 Oct 2015 00:59:50 +0000 (UTC) Received: by wicfx6 with SMTP id fx6so72331513wic.1 for ; Sat, 24 Oct 2015 17:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=DgSi0/pURklB4RuIOZJ9K2JbEv8W6NHHVU/oJ3LYtg0=; b=PvsI80vwaATVoxKYiRWkAUbj3SZR7+I9bKSD7QHGHr3Mdc/rGDZXeYZP9e4SFFEItV o1yHyTO8DprEEit6o6sPnkMii0JNp0FZpJqIUCfkFaTVMpUCx6OZpgyIHoVIP6yZjLoG LZTsRK7DsFaPqDvevZ6E2RpUxAPo0gqTXVaGiVc8ygo46bdm3zPULCUK472/UMFjI4WB b79JIMZ5VicSMmhHwL2EjfX03Wukx6AwPaGrwTIrBemLOGURSe1PtReCWkbuzINbwD/H 57Qlofh5pJ3fAuHyNkEqg2pCE18Jg2KiU7sTa1qD7TTK6GiTHfHUYlC6JQLm2NBOGTHp cTmA== X-Received: by 10.180.19.40 with SMTP id b8mr12885643wie.5.1445734789566; Sat, 24 Oct 2015 17:59:49 -0700 (PDT) Received: from localhost.localdomain (vno44-1-88-172-188-148.fbx.proxad.net. [88.172.188.148]) by smtp.gmail.com with ESMTPSA id jd9sm8406757wic.0.2015.10.24.17.59.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 24 Oct 2015 17:59:49 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= To: Date: Sun, 25 Oct 2015 02:59:29 +0200 Message-Id: <1445734779-7212-3-git-send-email-benoit.thebaudeau.dev@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445734779-7212-1-git-send-email-benoit.thebaudeau.dev@gmail.com> References: <1445734779-7212-1-git-send-email-benoit.thebaudeau.dev@gmail.com> MIME-Version: 1.0 Cc: Thomas Petazzoni , =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Subject: [Buildroot] [PATCH v3 03/13] package/dhcp/S80dhcp-server: support extra options 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" From: Benoît Thébaudeau Add an OPTIONS configuration variable in order to make it possible to pass custom extra options to dhcpd. Signed-off-by: Benoît Thébaudeau --- Changes v2 -> v3: none. Changes v1 -> v2: - Rebase. --- package/dhcp/S80dhcp-server | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/dhcp/S80dhcp-server b/package/dhcp/S80dhcp-server index f7907e2..c1ef53b 100755 --- a/package/dhcp/S80dhcp-server +++ b/package/dhcp/S80dhcp-server @@ -7,6 +7,9 @@ # 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" [ -r "${CFG_FILE}" ] && . "${CFG_FILE}" @@ -21,7 +24,7 @@ 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 /usr/sbin/dhcpd -- -q $OPTIONS $INTERFACES [ $? = 0 ] && echo "OK" || echo "FAIL" ;; stop)