From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Vejfd-0008K2-8b for ptxdist@pengutronix.de; Fri, 08 Nov 2013 11:52:11 +0100 Received: from compute3.internal (compute3.nyi.mail.srv.osa [10.202.2.43]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id ACAD322069 for ; Fri, 8 Nov 2013 05:52:08 -0500 (EST) Received: from [192.168.2.12] (unknown [95.208.79.145]) by mail.messagingengine.com (Postfix) with ESMTPA id 3236E68011A for ; Fri, 8 Nov 2013 05:52:07 -0500 (EST) Mime-Version: 1.0 (Mac OS X Mail 7.0 \(1816\)) From: Jean-Claude Monnin In-Reply-To: <75A20F57-1DBF-4D40-BBA2-FE8148E1E03A@emailplus.org> Date: Fri, 8 Nov 2013 11:52:07 +0100 Message-Id: References: <75A20F57-1DBF-4D40-BBA2-FE8148E1E03A@emailplus.org> Subject: [ptxdist] [PATCH 2/2] busybox: add option to install udhcpd start script Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Signed-off-by: Jean-Claude Monnin --- generic/etc/init.d/udhcpd | 21 +++++++++++++++++++++ rules/busybox-bbinit.in | 6 ++++++ rules/busybox.in | 6 ++++++ rules/busybox.make | 10 ++++++++++ 4 files changed, 43 insertions(+) create mode 100644 generic/etc/init.d/udhcpd diff --git a/generic/etc/init.d/udhcpd b/generic/etc/init.d/udhcpd new file mode 100644 index 0000000..a10226e --- /dev/null +++ b/generic/etc/init.d/udhcpd @@ -0,0 +1,21 @@ +#!/bin/sh +# +# /etc/init.d/udhcpd +# +# $Id$ +# + +if [ -f /usr/sbin/udhcpd ]; then + echo "Starting udhcpd..." + /usr/sbin/udhcpd + exit 0 +fi + +if [ -f /sbin/udhcpd ]; then + echo "Starting udhcpd..." + /sbin/udhcpd -d + exit 0 +fi + +echo "No udhcpd found. Aborting" + diff --git a/rules/busybox-bbinit.in b/rules/busybox-bbinit.in index d414a51..65c8c79 100644 --- a/rules/busybox-bbinit.in +++ b/rules/busybox-bbinit.in @@ -30,6 +30,12 @@ config BUSYBOX_TELNETD_BBINIT_LINK prompt "telnetd" default "S16telnetd" +config BUSYBOX_UDHCPD_BBINIT_LINK + string + depends on BUSYBOX_UDHCPD_STARTSCRIPT + prompt "udhcpd" + default "S60udpcpd" + config BUSYBOX_BB_SYSCTL_BBINIT_LINK string depends on BUSYBOX_BB_SYSCTL_STARTSCRIPT diff --git a/rules/busybox.in b/rules/busybox.in index 28a68a3..7a41e7c 100644 --- a/rules/busybox.in +++ b/rules/busybox.in @@ -52,6 +52,12 @@ choice start busybox telnetd server from inetd endchoice +config BUSYBOX_UDHCPD_STARTSCRIPT + bool + depends on BUSYBOX_UDHCPD + default y + prompt "Install /etc/init.d/udhcpd" + config BUSYBOX_SYSLOGD_STARTSCRIPT bool depends on BUSYBOX_SYSLOGD diff --git a/rules/busybox.make b/rules/busybox.make index c02f594..385b2c4 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -163,6 +163,16 @@ ifneq ($(call remove_quotes,$(PTXCONF_BUSYBOX_TELNETD_BBINIT_LINK)),) endif endif +ifdef PTXCONF_BUSYBOX_UDHCPD_STARTSCRIPT + @$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/udhcpd) + +ifneq ($(call remove_quotes,$(PTXCONF_BUSYBOX_UDHCPD_BBINIT_LINK)),) + @$(call install_link, busybox, \ + ../init.d/udhcpd, \ + /etc/rc.d/$(PTXCONF_BUSYBOX_UDHCPD_BBINIT_LINK)) +endif +endif + ifdef PTXCONF_BUSYBOX_SYSLOGD_STARTSCRIPT @$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/syslogd) -- 1.8.1.2 -- ptxdist mailing list ptxdist@pengutronix.de