Patchwork busybox: Add inetd related files

login
register
mail settings
Submitter Franklin Cooper Jr.
Date July 27, 2012, 7:52 p.m.
Message ID <1343418723-28606-1-git-send-email-fcooper@ti.com>
Download mbox | patch
Permalink /patch/33233/
State Rejected
Headers show

Comments

Franklin Cooper Jr. - July 27, 2012, 7:52 p.m.
* Add back inetd and inetd.conf files which are needed if
  CONFIG_INETD is enabled in the defconfig. Grabbed these files
  from oe-classic

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
 meta/recipes-core/busybox/busybox_1.19.4.bb |    4 ++-
 meta/recipes-core/busybox/files/inetd       |   33 +++++++++++++++++++++++++++
 meta/recipes-core/busybox/files/inetd.conf  |   20 ++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletions(-)
 create mode 100755 meta/recipes-core/busybox/files/inetd
 create mode 100644 meta/recipes-core/busybox/files/inetd.conf
Phil Blundell - July 27, 2012, 8:01 p.m.
On Fri, 2012-07-27 at 14:52 -0500, Franklin S Cooper Jr wrote:
> +if ! [ -x /usr/sbin/inetd ]; then
>+       exit 0
>+fi

That should be ${sbindir}.

p.
Franklin Cooper Jr. - July 27, 2012, 8:26 p.m.
The section you mentioned is within the file inetd which I am adding to the SRC_URI list in the busybox_1.19.4.bb file. The variable ${sbindir} won't be expanded. 

-----Original Message-----
From: Phil Blundell [mailto:philb@gnu.org] 
Sent: Friday, July 27, 2012 3:02 PM
To: Patches and discussions about the oe-core layer
Cc: Cooper Jr., Franklin
Subject: Re: [OE-core] [PATCH] busybox: Add inetd related files

On Fri, 2012-07-27 at 14:52 -0500, Franklin S Cooper Jr wrote:
> +if ! [ -x /usr/sbin/inetd ]; then
>+       exit 0
>+fi

That should be ${sbindir}.

p.
Phil Blundell - July 27, 2012, 8:43 p.m.
On Fri, 2012-07-27 at 20:26 +0000, Cooper Jr., Franklin wrote:
> The section you mentioned is within the file inetd which I am adding to the SRC_URI list in the busybox_1.19.4.bb file. The variable ${sbindir} won't be expanded. 

Right, so you need to arrange for it to get expanded.  If you hardcode
the path, the script will just fail unless ${sbindir} happens to be set
to /usr/sbin.

p.
Mark Hatle - July 27, 2012, 8:59 p.m.
On 7/27/12 3:26 PM, Cooper Jr., Franklin wrote:
> The section you mentioned is within the file inetd which I am adding to the SRC_URI list in the busybox_1.19.4.bb file. The variable ${sbindir} won't be expanded.
>
> -----Original Message-----
> From: Phil Blundell [mailto:philb@gnu.org]
> Sent: Friday, July 27, 2012 3:02 PM
> To: Patches and discussions about the oe-core layer
> Cc: Cooper Jr., Franklin
> Subject: Re: [OE-core] [PATCH] busybox: Add inetd related files
>
> On Fri, 2012-07-27 at 14:52 -0500, Franklin S Cooper Jr wrote:
>> +if ! [ -x /usr/sbin/inetd ]; then
>> +       exit 0
>> +fi
>
> That should be ${sbindir}.

Inline sed of the initscript may be the easiest way to do this.

You need to expand it, you can not rely on /usr/sbin/inetd, as OE-Core expressly 
permits people to change the bindir and sbindir locations.  (Generally if 
someone does, they change from /usr/sbin to /sbin, and /usr/bin to /bin...)

--Mark

> p.
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Franklin Cooper Jr. - July 27, 2012, 10:10 p.m.
This patch was meant for the denzil branch and I also forgot to bump the PR in the busybox_1.19.4.bb file. So I rejected this patch in Patchworks and submitted an updated one. I also made a tweak that addresses your concern.

-----Original Message-----
From: Phil Blundell [mailto:philb@gnu.org] 
Sent: Friday, July 27, 2012 3:43 PM
To: Cooper Jr., Franklin
Cc: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH] busybox: Add inetd related files

On Fri, 2012-07-27 at 20:26 +0000, Cooper Jr., Franklin wrote:
> The section you mentioned is within the file inetd which I am adding to the SRC_URI list in the busybox_1.19.4.bb file. The variable ${sbindir} won't be expanded. 

Right, so you need to arrange for it to get expanded.  If you hardcode
the path, the script will just fail unless ${sbindir} happens to be set
to /usr/sbin.

p.

Patch

diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index ad8297e..f87cb5f 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -24,7 +24,9 @@  SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://mdev \
            file://mdev.conf \
            file://umount.busybox \
-           file://defconfig"
+           file://defconfig \
+           file://inetd.conf \
+           file://inetd"
 
 SRC_URI[tarball.md5sum] = "9c0cae5a0379228e7b55e5b29528df8e"
 SRC_URI[tarball.sha256sum] = "9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee"
diff --git a/meta/recipes-core/busybox/files/inetd b/meta/recipes-core/busybox/files/inetd
new file mode 100755
index 0000000..cf50bcd
--- /dev/null
+++ b/meta/recipes-core/busybox/files/inetd
@@ -0,0 +1,33 @@ 
+#!/bin/sh
+#
+# start/stop inetd super server.
+
+if ! [ -x /usr/sbin/inetd ]; then
+	exit 0
+fi
+
+case "$1" in
+    start)
+	echo -n "Starting internet superserver:"
+	echo -n " inetd" ; start-stop-daemon -S -x /usr/sbin/inetd > /dev/null
+	echo "."
+	;;
+    stop)
+	echo -n "Stopping internet superserver:"
+	echo -n " inetd" ; start-stop-daemon -K -x /usr/sbin/inetd > /dev/null
+	echo "."
+	;;
+    restart)
+	echo -n "Restarting internet superserver:"
+	echo -n " inetd "
+	killall -HUP inetd
+	echo "."
+	;;
+    *)
+	echo "Usage: /etc/init.d/inetd {start|stop|restart}"
+	exit 1
+	;;
+esac
+
+exit 0
+
diff --git a/meta/recipes-core/busybox/files/inetd.conf b/meta/recipes-core/busybox/files/inetd.conf
new file mode 100644
index 0000000..b02fe85
--- /dev/null
+++ b/meta/recipes-core/busybox/files/inetd.conf
@@ -0,0 +1,20 @@ 
+# /etc/inetd.conf:  see inetd(8) for further informations.
+#
+# Internet server configuration database
+#
+# If you want to disable an entry so it isn't touched during
+# package updates just comment it out with a single '#' character.
+#
+# <service_name> <sock_type> <proto> <flags> <user> <server_path> <args>
+#
+#:INTERNAL: Internal services
+#echo		stream	tcp	nowait	root	internal
+#echo		dgram	udp	wait	root	internal
+#chargen	stream	tcp	nowait	root	internal
+#chargen	dgram	udp	wait	root	internal
+#discard		stream	tcp	nowait	root	internal
+#discard		dgram	udp	wait	root	internal
+#daytime		stream	tcp	nowait	root	internal
+#daytime	dgram	udp	wait	root	internal
+#time		stream	tcp	nowait	root	internal
+#time		dgram	udp	wait	root	internal