r1815 - in trunk/user

[stsp at dslinux.in-berlin.de]

Author: stsp
Date: 2007-07-13 01:39:41 +0200 (Fri, 13 Jul 2007)
New Revision: 1815

Log:
Don't touch /etc/inetd.conf so local modifications won't be
destroyed on upgrades. Instead, provide /etc/inetd.conf.example
listing all available services, all disabled.

Inspired by Sonny Jim's ftpd patch.


Modified: trunk/user/dropbear/Makefile
===================================================================
--- trunk/user/dropbear/Makefile	2007-07-12 23:20:29 UTC (rev 1814)
+++ trunk/user/dropbear/Makefile	2007-07-12 23:39:41 UTC (rev 1815)
@@ -218,5 +218,5 @@
 	done
 	$(ROMFSINST) dbclient /bin/ssh
 	$(ROMFSINST) -e CONFIG_USER_DROPBEAR_DROPBEAR \
-		-a "#ssh     stream tcp nowait root /bin/dropbear -i" /etc/inetd.conf
+		-a "#ssh     stream tcp nowait root /bin/dropbear -i" /etc/inetd.conf.example
 

Modified: trunk/user/games/advent4/Makefile
===================================================================
--- trunk/user/games/advent4/Makefile	2007-07-12 23:20:29 UTC (rev 1814)
+++ trunk/user/games/advent4/Makefile	2007-07-12 23:39:41 UTC (rev 1815)
@@ -22,7 +22,7 @@
 romfs:
 	$(ROMFSINST) $(GAMESDIR)/advent4
 	$(ROMFSINST) -e CONFIG_USER_GAMES_ADVENT4 \
-		-a "advent4 stream tcp nowait root $(GAMESDIR)/advent4" /etc/inetd.conf
+		-a "#advent4 stream tcp nowait root $(GAMESDIR)/advent4" /etc/inetd.conf.example
 
 clean:
 	rm -f *.o *.err advent4 advent4.elf advent4.gdb

Modified: trunk/user/games/dungeon/Makefile
===================================================================
--- trunk/user/games/dungeon/Makefile	2007-07-12 23:20:29 UTC (rev 1814)
+++ trunk/user/games/dungeon/Makefile	2007-07-12 23:39:41 UTC (rev 1815)
@@ -70,7 +70,7 @@
 	$(ROMFSINST) $(GAMESDIR)/dungeon
 	$(ROMFSINST) dtextc.dat /$(LIBDIR)/dtextc.dat
 	$(ROMFSINST) -e CONFIG_USER_GAMES_DUNGEON \
-		-a "#dungeon stream tcp nowait root $(GAMESDIR)/dungeon" /etc/inetd.conf
+		-a "#dungeon stream tcp nowait root $(GAMESDIR)/dungeon" /etc/inetd.conf.example
 
 clean:
 	rm -f $(OBJS) dungeon core dsave.dat *~ dungeon.gdb dungeon.elf

Modified: trunk/user/telnetd/Makefile
===================================================================
--- trunk/user/telnetd/Makefile	2007-07-12 23:20:29 UTC (rev 1814)
+++ trunk/user/telnetd/Makefile	2007-07-12 23:39:41 UTC (rev 1815)
@@ -22,7 +22,7 @@
 romfs:
 	$(ROMFSINST) /bin/$(EXEC)
 	$(ROMFSINST) -e CONFIG_USER_TELNETD_TELNETD \
-		-a "telnet  stream tcp nowait root /bin/telnetd" /etc/inetd.conf
+		-a "#telnet  stream tcp nowait root /bin/telnetd" /etc/inetd.conf.example
 
 clean:
 	-rm -f $(EXEC) *.elf *.gdb *.o