From patchwork Mon May 28 07:41:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keguang Zhang X-Patchwork-Id: 161591 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id DBC57B6FA8 for ; Mon, 28 May 2012 17:41:41 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C295DA035C; Mon, 28 May 2012 07:41:38 +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 eIBT2eBsXNcp; Mon, 28 May 2012 07:41:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7A2FEA0124; Mon, 28 May 2012 07:41:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7130D8F753 for ; Mon, 28 May 2012 07:41:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 675488D4D3 for ; Mon, 28 May 2012 07:41:36 +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 sZBvOLXENWuY for ; Mon, 28 May 2012 07:41:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pb0-f43.google.com (mail-pb0-f43.google.com [209.85.160.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7EA4E8D4B5 for ; Mon, 28 May 2012 07:41:35 +0000 (UTC) Received: by pbcwz7 with SMTP id wz7so6526887pbc.16 for ; Mon, 28 May 2012 00:41:35 -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:x-mailer; bh=m1avPiiAkT+RippbAFdcWPOaZhwQIQuxFTmDL6APSTU=; b=PsiMMz0iXpU4zSc9oOxmBg5VQvqgEgmKMR1SBps2JMgRK72B9rni8NKHBhDUT1pl9B QLaLCAuNVb+uwwgvQs+pj0+YdooKegz+8z5rSRspKiiF6F15D0p54INX04bW6sEgKQyp kDWN0wjC4Xev5hNjjdJhPxekFcamsTanzslwDv/QbuGNBAg9Vu+YGaNQf24+/WqnCtyM 43DwxJqZGY3TWGWTxe2qpitFS02MwVEdEPtaTUlhTl/PisS7TrHgQJtX8yr5k2d7Lr3u c553Rdk+8RQwhtF2MRwmJrlT+81z9VI97aojUntwhTHltyU0rntI5cHiHQtEZ4lkrDCx QXkw== Received: by 10.68.203.73 with SMTP id ko9mr25038745pbc.66.1338190894913; Mon, 28 May 2012 00:41:34 -0700 (PDT) Received: from kelvin-Work.chd.intersil.com ([182.148.112.76]) by mx.google.com with ESMTPS id pj5sm18435619pbb.51.2012.05.28.00.41.29 (version=SSLv3 cipher=OTHER); Mon, 28 May 2012 00:41:33 -0700 (PDT) From: Kelvin Cheung To: buildroot@busybox.net Date: Mon, 28 May 2012 15:41:22 +0800 Message-Id: <1338190882-4548-1-git-send-email-keguang.zhang@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [Buildroot] [PATCH v2] busybox: Install S41inetd and inetd.conf if inetd is enabled in busybox. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Install S41inetd and inetd.conf if inetd is enabled in busybox. Add ftpd to /etc/inetd.conf if inetd and ftpd are enabled. Add telnetd to /etc/inetd.conf if inetd and telnetd are enabled. Add tftpd to /etc/inetd.conf if inetd and tftpd are enabled. Changes for v2: Update ftpd and tftpd configuration in inetd.conf. Signed-off-by: Kelvin Cheung --- package/busybox/S41inetd | 28 ++++++++++++++++++++++++++++ package/busybox/busybox.mk | 32 ++++++++++++++++++++++++++++++++ package/busybox/inetd.conf | 3 +++ 3 files changed, 63 insertions(+), 0 deletions(-) create mode 100644 package/busybox/S41inetd create mode 100644 package/busybox/inetd.conf diff --git a/package/busybox/S41inetd b/package/busybox/S41inetd new file mode 100644 index 0000000..9d7d3cd --- /dev/null +++ b/package/busybox/S41inetd @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Starts the inetd daemon. +# + +NAME=inetd +DAEMON=/usr/sbin/$NAME + +case "$1" in + start) + echo -n "Starting $NAME: " + start-stop-daemon -S -q -x $DAEMON && echo "OK" || echo "Failed" + ;; + stop) + echo -n "Stopping $NAME: " + start-stop-daemon -K -q -n $NAME && echo "OK" || echo "Failed" + ;; + restart|reload) + $0 stop + $0 start + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? + diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 1d988f8..4ddd552 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -155,6 +155,36 @@ define BUSYBOX_INSTALL_WATCHDOG_SCRIPT endef endif +define BUSYBOX_INSTALL_INETD_SCRIPT + if grep -q CONFIG_INETD=y $(@D)/.config; then \ + [ -f $(TARGET_DIR)/etc/init.d/S41inetd ] || \ + $(INSTALL) -m 0755 -D package/busybox/S41inetd \ + $(TARGET_DIR)/etc/init.d/S41inetd; \ + else rm -f $(TARGET_DIR)/etc/init.d/S41inetd; fi +endef +define BUSYBOX_INSTALL_INETD_CONF + if grep -q CONFIG_INETD=y $(@D)/.config; then \ + [ -f $(TARGET_DIR)/etc/inetd.conf ] || \ + install -D -m 0644 package/busybox/inetd.conf \ + $(TARGET_DIR)/etc/inetd.conf; \ + if grep -q CONFIG_FTPD=y $(@D)/.config; then \ + if ! grep -q '^ftp' $(TARGET_DIR)/etc/inetd.conf; then \ + echo -e "ftp\tstream\ttcp\tnowait\troot\tftpd\tftpd -w /root" >> $(TARGET_DIR)/etc/inetd.conf; \ + fi; \ + else $(SED) '/^ftp/d' $(TARGET_DIR)/etc/inetd.conf; fi; \ + if grep -q CONFIG_TELNETD=y $(@D)/.config; then \ + if ! grep -q '^telnet' $(TARGET_DIR)/etc/inetd.conf; then \ + echo -e "telnet\tstream\ttcp\tnowait\troot\ttelnetd\ttelnetd -i" >> $(TARGET_DIR)/etc/inetd.conf; \ + fi; \ + else $(SED) '/^telnet/d' $(TARGET_DIR)/etc/inetd.conf; fi; \ + if grep -q CONFIG_TFTPD=y $(@D)/.config; then \ + if ! grep -q '^tftp' $(TARGET_DIR)/etc/inetd.conf; then \ + echo -e "tftp\tdgram\tudp\tnowait\troot\ttftpd\ttftpd -l -c /root" >> $(TARGET_DIR)/etc/inetd.conf; \ + fi; \ + else $(SED) '/^tftp/d' $(TARGET_DIR)/etc/inetd.conf; fi \ + else rm -f $(TARGET_DIR)/etc/inetd.conf; fi +endef + # We do this here to avoid busting a modified .config in configure BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG @@ -187,6 +217,8 @@ define BUSYBOX_INSTALL_TARGET_CMDS $(BUSYBOX_INSTALL_MDEV_CONF) $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) + $(BUSYBOX_INSTALL_INETD_SCRIPT) + $(BUSYBOX_INSTALL_INETD_CONF) endef define BUSYBOX_UNINSTALL_TARGET_CMDS diff --git a/package/busybox/inetd.conf b/package/busybox/inetd.conf new file mode 100644 index 0000000..82cfa15 --- /dev/null +++ b/package/busybox/inetd.conf @@ -0,0 +1,3 @@ +# +# +