From patchwork Sun Oct 25 00:59:32 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: 535518 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 582A614130B for ; Sun, 25 Oct 2015 12:00:23 +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=qDp5gP1u; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6C958322BD; Sun, 25 Oct 2015 01:00:22 +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 jTz9ipMCMNjO; Sun, 25 Oct 2015 01:00:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 01944316E2; Sun, 25 Oct 2015 01:00:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 625821C0BE0 for ; Sun, 25 Oct 2015 00:59:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5FF338761D for ; Sun, 25 Oct 2015 00:59:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6ItK1GDYW0-b for ; Sun, 25 Oct 2015 00:59:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BB2E0872F3 for ; Sun, 25 Oct 2015 00:59:53 +0000 (UTC) Received: by wicll6 with SMTP id ll6so72677559wic.1 for ; Sat, 24 Oct 2015 17:59:52 -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=YZDeeiTpE9gtCA3dd9p2MR3izVLI+Hm89Q13TcBHbts=; b=qDp5gP1uDCtnDa22XxfPY8z92V/0V9z9JIu615+Y79OWdQDbEOktxwC+rIAZVh5s9e I7nBZgqxLHGDuhVFw0+TRFOqJjmtH3h2lH9KO2tnJLZ+OGucUuhildiTuDsL7lQy8m2j vo05bK3Ssps/uK7q3X1MhpW3oo6frNIw30TG7R1ZZRLeQw/UhRQf9gjB5reTIvTx8gdv M/JsWxL1Rnno2TTW9ZMOJ+zUa8Q61KL72wXVLElDJ2EU73Rf6L0hHqe5KvTMm9a0xH1b oXPQlcB0G0eTbK4eEzBL7/IOF0whjPo5aXqUtk+0gM/i+OyKkJGbcLPFtzFmdVxOSGMr sVKA== X-Received: by 10.180.99.69 with SMTP id eo5mr12920121wib.73.1445734792405; Sat, 24 Oct 2015 17:59:52 -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.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 24 Oct 2015 17:59:51 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= To: Date: Sun, 25 Oct 2015 02:59:32 +0200 Message-Id: <1445734779-7212-6-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 06/13] package/dhcp: systemd: allow missing environment file 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" The dhcpd daemon does not require network interface names to be specified on the command line. >From dhcpd(8): "The names of the network interfaces on which dhcpd should listen for broadcasts may be specified on the command line. This should be done on systems where dhcpd is unable to identify non-broadcast interfaces, but should not be required on other systems. If no interface names are specified on the command line dhcpd will identify all network interfaces which are up, eliminating non-broadcast interfaces if possible, and listen for DHCP broadcasts on each interface." dhcpd exits with "Not configured to listen on any interfaces!" only if no requested (those in INTERFACES, or all if empty) non-broadcast interfaces matching the subnet declarations in dhcpd.conf are up. Also, no extra options are required on the command line, which means that the EnvironmentFile file does not have to be present, so make it optional. Signed-off-by: Benoît Thébaudeau Reviewed-by: "Maxime Hadjinlian" --- Changes v2 -> v3: new patch. --- package/dhcp/dhcpd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dhcp/dhcpd.service b/package/dhcp/dhcpd.service index ad1300c..98cc54b 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 $OPTIONS $INTERFACES KillSignal=SIGINT -EnvironmentFile=/etc/default/dhcpd +EnvironmentFile=-/etc/default/dhcpd [Install] WantedBy=multi-user.target