Telnetd startup script was not correctly installed when UTELNETD_STARTSCRIPT
was selected in the configuration

Signed-off-by: Bart vd. Meulen <bartvdrmeu...@gmail.com>
---
 rules/initmethod-bbinit.in |    2 +-
 rules/utelnetd.make        |    8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

Index: ptxdist-trunk/rules/initmethod-bbinit.in
===================================================================
--- ptxdist-trunk.orig/rules/initmethod-bbinit.in       2009-06-10 
10:31:15.000000000 +0200
+++ ptxdist-trunk/rules/initmethod-bbinit.in    2009-06-10 10:33:09.000000000 
+0200
@@ -199,7 +199,7 @@ config INITMETHOD_BBINIT_LINK_SYSLOG_NG
 
 config INITMETHOD_BBINIT_LINK_TELNETD
        string
-       depends on BUSYBOX_TELNETD_STARTSCRIPT
+       depends on BUSYBOX_TELNETD_STARTSCRIPT || UTELNETD_STARTSCRIPT
        prompt "telnetd"
        default "S16telnetd"
 
Index: ptxdist-trunk/rules/utelnetd.make
===================================================================
--- ptxdist-trunk.orig/rules/utelnetd.make      2009-06-10 10:31:15.000000000 
+0200
+++ ptxdist-trunk/rules/utelnetd.make   2009-06-10 10:33:09.000000000 +0200
@@ -72,14 +72,8 @@ $(STATEDIR)/utelnetd.targetinstall:
                $(UTELNETD_DIR)/utelnetd, \
                /sbin/utelnetd)
 
-       #
-       # busybox init
-       #
-
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_UTELNETD_STARTSCRIPT
-       @$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/telnetd, 
n)
-endif
+       @$(call install_alternative, utelnetd, 0, 0, 0755, /etc/init.d/telnetd, 
n)
 endif
 
        @$(call install_finish, utelnetd)

-- 


This message and attachment(s) are intended solely for use by the addressee and 
may contain information that is privileged, confidential or otherwise exempt 
from disclosure under applicable law.

If you are not the intended recipient or agent thereof responsible for 
delivering this message to the intended recipient, you are hereby notified that 
any dissemination, distribution or copying of this communication is strictly 
prohibited.

If you have received this communication in error, please notify the sender 
immediately by telephone and with a 'reply' message.

Thank you for your co-operation.



--
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to