* inetutils - tftpd

	 - cannot start standalone, removing all menu entries
	   that selects standalone startup
	 - always needs inetd to run


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6730 33e552b5-05e3-0310-8538-816dae2090ed

3 files changed, 5 insertions, 95 deletions

diff --git a/rules/inetutils.in b/rules/inetutils.in
index fd08c634c..767e5ec64 100644
--- a/rules/inetutils.in
+++ b/rules/inetutils.in
@@ -119,62 +119,15 @@ config INETUTILS_TFTPD_BASE_DIR
 	  This string is added to tftpd's command parameters. Placeholder @ROOT@
 	  in all startup options will be replaced by the string given here
 
-choice
-	prompt "Kind of tftpd startup"
-	depends on INETUTILS
-	depends on INETUTILS_TFTPD
-	default INETUTILS_TFTPD_STARTUP_TYPE_INETD
-
-	config INETUTILS_TFTPD_STARTUP_TYPE_INETD
-		bool
-		prompt "inetd driven"
-		help
-		 tftp server will be started on demand from inetd. This installs
-		 a startup configuration for tftpd from inetd. It adds to the
-		 /etc/inetd.conf a line like this:
-		 tftp dgram udp wait nobody /sbin/tftpd tftpd -l @ROOT@
-		 Note: You must enable one of the two possible inet daemons:
-		 There is one embedded in busybox and one in this packet.
-
-	config INETUTILS_TFTPD_STARTUP_TYPE_STANDALONE
-		bool
-		prompt "standalone"
-		help
-		  This installs tftpd startup script /etc/init.d/tftpd. With this
-		  script the tftpd server will be started at system startup and
-		  waits for connections
-
-endchoice
-
 config INETUTILS_TFTPD_STRING
 	string
 	depends on INETUTILS
-	depends on INETUTILS_TFTPD_STARTUP_TYPE_INETD
+	depends on INETUTILS_TFTPD
 	prompt "inetd service entry"
 	default "tftp dgram udp wait nobody /sbin/tftpd tftpd -l @ROOT@"
 	help
-	  This string is added to inetd's configuration /etc/inetd.conf. @ROOT@
+	  The string defined here is added to inetd's configuration /etc/inetd.conf. @ROOT@
 	  in this string will be replaced by tftpd exported directory
-
-choice
-	prompt "Kind of startup script"
-	depends on INETUTILS
-	depends on INETUTILS_TFTPD_STARTUP_TYPE_STANDALONE
-	default INETUTILS_ETC_INITD_TFTPD_DEFAULT
-
-	config INETUTILS_ETC_INITD_TFTPD_DEFAULT
-		bool
-		prompt "Use generic"
-		help
-			Installs a generic /etc/init.d/tftpd startup script.
-			See <ptxdist-install>/generic/etc/init.d/tftpd
-
-	config INETUTILS_ETC_INITD_TFTPD_USER
-		bool
-		prompt "User defined"
-		help
-			This uses a user defined tftpd startup script. PTXdist
-			uses files projectroot/etc/init.d/tftpd in your local
-			project
-
-endchoice
+	  Note: This tftp daemon can be started on demand from inetd only. You
+	  must enable one of the two possible inet daemons: There is one
+	  embedded in busybox and one in this packet.
diff --git a/rules/inetutils.make b/rules/inetutils.make
index 7181430a0..b020be802 100644
--- a/rules/inetutils.make
+++ b/rules/inetutils.make
@@ -256,39 +256,6 @@ ifneq ($(PTXCONF_INETUTILS_TFTPD_BASE_DIR),"")
 endif
 endif
 #
-# Install the startup script for tftpd on request only
-#
-ifdef PTXCONF_INETUTILS_TFTPD_STARTUP_TYPE_STANDALONE
-ifdef PTXCONF_INETUTILS_ETC_INITD_TFTPD_DEFAULT
-# install the generic one
-	@$(call install_copy, inetutils, 0, 0, 0755, \
-		$(PTXDIST_TOPDIR)/generic/etc/init.d/tftpd, \
-		/etc/init.d/tftpd, n)
-endif
-ifdef PTXCONF_INETUTILS_ETC_INITD_TFTPD_USER
-# install users one
-	@$(call install_copy, inetutils, 0, 0, 0755, \
-		${PTXDIST_WORKSPACE}/projectroot/etc/init.d/tftpd, \
-		/etc/init.d/tftpd, n)
-endif
-# replace the base dir on demand
-ifneq ($(PTXCONF_INETUTILS_TFTPD_BASE_DIR),"")
-	@$(call install_replace, inetutils, \
-		/etc/init.d/tftpd, \
-		@ROOT@, \
-		$(PTXCONF_INETUTILS_TFTPD_BASE_DIR) )
-endif
-#
-# FIXME: Is this packet the right location for the link?
-#
-ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TFTPD_LINK),"")
-	@$(call install_copy, inetutils, 0, 0, 0755, /etc/rc.d)
-	@$(call install_link, inetutils, ../init.d/tftpd, \
-		/etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_TFTPD_LINK))
-endif
-endif
-
-#
 # Install the startup for inetd script on request only
 #
 ifdef PTXCONF_INETUTILS_ETC_INITD_INETD
diff --git a/rules/rootfs_rc_d_links.in b/rules/rootfs_rc_d_links.in
index c30be13ba..049eda5a1 100644
--- a/rules/rootfs_rc_d_links.in
+++ b/rules/rootfs_rc_d_links.in
@@ -232,16 +232,6 @@ config ROOTFS_ETC_INITD_TIMEKEEPER_LINK
 	  sync the system with an internal real time clock when it starts up.
 	  Keep this entry empty if you want to sync manually.
 
-config ROOTFS_ETC_INITD_TFTPD_LINK
-	depends on INETUTILS_TFTPD_STARTUP_TYPE_STANDALONE
-	string
-	prompt "tftpd link name"
-	default "S21_tftpd"
-	help
-	  Set a link into /etc/rc.d which points to /etc/init.d/tftpd to
-	  start tftpd when system starts. Keep this entry empty if
-	  you do not want to start this service automatically.
-
 # ----------------------------------------------------------------------------
 
 endmenu