remove inetd.conf leftovers

Remove the remaining traces of the old inetd.conf method. We use
postinst-generation of /etc/inetd.conf now.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

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

6 files changed, 28 insertions, 29 deletions

diff --git a/rules/cvs.in b/rules/cvs.in
index a229359fa..41a2a4af8 100644
--- a/rules/cvs.in
+++ b/rules/cvs.in
@@ -130,10 +130,11 @@ choice
 		bool
 		prompt "inetd"
 		help
-		  cvs server will be started on demand from inetd. This installs
-		  a startup configuration for cvs from inetd. It adds to the
-		  /etc/inetd.conf a line like this:
+		  Install a inetd rule for cvs. This option adds the following line
+		  to /etc/inetd.conf.d/cvs:
+
 		  cvs stream tcp nowait root /usr/bin/cvs cvsd -f --allow-root=/srv/cvsroot pserver
+
 		  Note: You must enable one of the two possible inet daemons:
 		  There is one embedded in busybox and one in packet inetutils.
 endchoice
diff --git a/rules/dnsmasq.in b/rules/dnsmasq.in
index 1d2c0b829..ffca30228 100644
--- a/rules/dnsmasq.in
+++ b/rules/dnsmasq.in
@@ -56,15 +56,16 @@ choice
 		bool
 		prompt "inetd driven"
 		help
-		 dnsmasq will be started on demand from inetd. This installs
-		 a startup configuration for dnsmasq from inetd. It adds to the
-		 /etc/inetd.conf a line like this:
-		 domain stream tcp nowait root /sbin/dnsmasq domain
-		 Note: You must enable one of the two possible inet daemons:
-		 There is one embedded in busybox and one in packet inetutils.
-		 Note: If you want to use dnsmasq's DHCP feature, you can't
-		 run it from inetd. In this case you need the standalone
-		 startscript!
+		  Install a inetd rule for dnsmasq. This option adds the following line
+		  to /etc/inetd.conf.d/dnsmasq:
+
+		  domain stream tcp nowait root /sbin/dnsmasq domain
+
+		  Note: You must enable one of the two possible inet daemons:
+		  There is one embedded in busybox and one in packet inetutils.
+		  Note: If you want to use dnsmasq's DHCP feature, you can't
+		  run it from inetd. In this case you need the standalone
+		  startscript!
 
 	config DNSMASQ_STARTSCRIPT
 		bool
diff --git a/rules/fam.in b/rules/fam.in
index 48e5ae624..ee515765f 100644
--- a/rules/fam.in
+++ b/rules/fam.in
@@ -48,9 +48,11 @@ choice
 		bool
 		prompt "inetd driven"
 		help
-		  This installs a startup configuration for famd from inetd. It adds to
-		  the /etc/inetd.conf a line like this:
-		   sgi_fam/1-2 stream  rpc/tcp wait root /usr/sbin/famd famd -c /etc/fam.conf
+		  Install a inetd rule for famd. This option adds the following line
+		  to /etc/inetd.conf.d/fam:
+
+		  sgi_fam/1-2 stream  rpc/tcp wait root /usr/sbin/famd famd -c /etc/fam.conf
+
 		  Note: You must enable one of the two possible inet daemons: There is
 		  one embedded in busybox and one in packet inetutils.
 
diff --git a/rules/portmap.make b/rules/portmap.make
index adcf2949d..4cf6b78eb 100644
--- a/rules/portmap.make
+++ b/rules/portmap.make
@@ -83,18 +83,15 @@ $(STATEDIR)/portmap.targetinstall:
 	@$(call install_copy, portmap, 0, 0, 0755, \
 		$(PORTMAP_DIR)/portmap, /sbin/portmap)
 
-#	#
-#	# busybox init
-#	#
+	#
+	# busybox init
+	#
 ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_PORTMAP_STARTSCRIPT
 	@$(call install_alternative, portmap, 0, 0, 0755, /etc/init.d/portmapd, n)
 endif
 endif
 
-#	#
-#	# /etc/inetd.conf sniplet
-#	#
 ifdef PTXCONF_PORTMAP_INETD_SERVER
 	@$(call install_alternative, portmap, 0, 0, 0644, /etc/inetd.conf.d/portmap, n)
 endif
diff --git a/rules/rsync.in b/rules/rsync.in
index a2513d294..32f3e4359 100644
--- a/rules/rsync.in
+++ b/rules/rsync.in
@@ -65,9 +65,11 @@ choice
 		bool
 		prompt "inetd driven"
 		help
-		  This installs a startup configuration for rsync from inetd. It adds to
-		  the /etc/inetd.conf a line like this:
+		  Install a inetd rule for rsync. This option adds the following line
+		  to /etc/inetd.conf.d/rsync:
+
 		  rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon @CONFIG@
+
 		  Note: You must enable one of the two possible inet daemons: There is
 		  one embedded in busybox and one in packet inetutils.
 
@@ -92,8 +94,8 @@ config RSYNC_INETD_STRING
 	prompt "inetd service entry"
 	default "rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon @CONFIG@"
 	help
-	  This string is added to inetd's configuration /etc/inetd.conf. @CONFIG@
-	  in this string will be replaced with the --config option, and the
+	  This string is added to the inetd configuration /etc/inetd.conf.d/rsync.
+          @CONFIG@ in this string will be replaced with the --config option, and the
 	  path given above for configuration
 
 endif
diff --git a/rules/rsync.make b/rules/rsync.make
index bed18b73f..4554dedea 100644
--- a/rules/rsync.make
+++ b/rules/rsync.make
@@ -104,10 +104,6 @@ endif
 endif
 endif
 
-	#
-	# /etc/inetd.conf sniplet
-	#
-
 ifdef PTXCONF_RSYNC_INETD_SERVER
 	@$(call install_alternative, rsync, 0, 0, 0644, /etc/inetd.conf.d/rsync, n)
 	@$(call install_replace, rsync, /etc/inetd.conf.d/rsync, \