r1880 - in trunk

[stsp at dslinux.in-berlin.de]

Author: stsp
Date: 2007-09-14 00:03:27 +0200 (Fri, 14 Sep 2007)
New Revision: 1880

Log:

Apply telnetd patch by Sonny Jim:

I've just checked out a clean svn for the first time in a while and I
noticed that telnetd still doesn't work on the DLDI build.  Here's a
patch that fixes it to run through inetd which works fine.  Also it
creates some entries for /etc/services, which it didn't before



Modified: trunk/user/busybox/Makefile
===================================================================
--- trunk/user/busybox/Makefile	2007-09-11 16:18:57 UTC (rev 1879)
+++ trunk/user/busybox/Makefile	2007-09-13 22:03:27 UTC (rev 1880)
@@ -166,7 +166,10 @@
 	fi
 	$(ROMFSINST) /bin/$(PROG)
 	$(SHELL) $< $(TARGETDIR)/bin/ --hardlinks --nosubdir
-
+	$(ROMFSINST) -e CONFIG_USER_BUSYBOX_TELNETD_INETD \
+			-a "#telnet     stream tcp nowait root /bin/telnetd" /etc/inetd.conf.example
+	$(ROMFSINST) -e CONFIG_USER_BUSYBOX_TELNETD_INETD \
+			-a "telnet 23/tcp" /etc/services
 check: busybox
 	bindir=$(top_builddir) srcdir=$(top_srcdir)/testsuite \
 	$(top_srcdir)/testsuite/runtest

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2007-09-11 16:18:57 UTC (rev 1879)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2007-09-13 22:03:27 UTC (rev 1880)
@@ -770,7 +770,7 @@
 # CONFIG_USER_BUSYBOX_TEE is not set
 # CONFIG_USER_BUSYBOX_TELNET is not set
 CONFIG_USER_BUSYBOX_TELNETD=y
-# CONFIG_USER_BUSYBOX_TELNETD_INETD is not set
+CONFIG_USER_BUSYBOX_TELNETD_INETD=y
 CONFIG_USER_BUSYBOX_TEST=y
 # CONFIG_USER_BUSYBOX_TEST_64 is not set
 # CONFIG_USER_BUSYBOX_TFTP is not set