From: Ben Gras <ben@minix3.org>
Date: Tue, 11 Apr 2006 11:55:45 +0000 (+0000)
Subject: (1) remove ftpd in favour of ftpd200
X-Git-Tag: v3.1.2a~32
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=103f18cb1f40d10544778719d674fe62187aefdf;p=minix.git

(1) remove ftpd in favour of ftpd200
(2) add /etc/rc.daemons.dist, can be copied to /etc/rc.daemons
    if user wants the standard daemons to run, which are no longer run
    by default
---

diff --git a/commands/Makefile b/commands/Makefile
index 10a36ab5c..e091ad0e3 100755
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -3,7 +3,7 @@
 MAKE	= exec make -$(MAKEFLAGS)
 BZIP2=bzip2-1.0.3
 
-SMALLPROGRAMS=`arch` aal advent ash autil awk bc byacc cawf cron de dhcpd dis88 elle elvis ftp ftpd ftpd200 httpd ibm indent m4 make mdb mined patch pax ps reboot rlogind scripts sh simple syslogd talk talkd telnet telnetd urlget yap zmodem
+SMALLPROGRAMS=`arch` aal advent ash autil awk bc byacc cawf cron de dhcpd dis88 elle elvis ftp ftpd200 httpd ibm indent m4 make mdb mined patch pax ps reboot rlogind scripts sh simple syslogd talk talkd telnet telnetd urlget yap zmodem
 
 usage:
 	@echo "Usage: make all          # Compile all commands" >&2
diff --git a/etc/Makefile b/etc/Makefile
index 78794a184..67837f4cd 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,7 +1,7 @@
 
 ETC=/etc/
 USRETC=/usr/etc/
-FILES1=fstab group hostname.file inet.conf motd mtab passwd profile protocols rc services termcap ttytab utmp rc.cd binary_sizes binary_sizes.big binary_sizes.xxl rc.rescue syslog.conf
+FILES1=fstab group hostname.file inet.conf motd mtab passwd profile protocols rc services termcap ttytab utmp rc.cd binary_sizes binary_sizes.big binary_sizes.xxl rc.rescue syslog.conf rc.daemons.dist
 FILES2=shadow
 FILES3=daily dhcptags.conf rc
 
diff --git a/etc/rc.daemons.dist b/etc/rc.daemons.dist
new file mode 100644
index 000000000..cd22f5529
--- /dev/null
+++ b/etc/rc.daemons.dist
@@ -0,0 +1,5 @@
+daemonize talkd
+daemonize tcpd shell in.rshd
+daemonize tcpd login in.rlogind
+daemonize tcpd telnet in.telnetd
+daemonize tcpd ftp in.ftpd
diff --git a/etc/usr/rc b/etc/usr/rc
index 9c2e93862..6bbecbfc8 100644
--- a/etc/usr/rc
+++ b/etc/usr/rc
@@ -67,6 +67,9 @@ up()
     service up /usr/sbin/$service "$@" 
 }
 
+
+DAEMONS=/etc/rc.daemons
+
 case $action in
 start)
     # Select console font.
@@ -130,16 +133,14 @@ start)
 	else
 	    # Standard network daemons.
     	    echo -n "Starting networking:"
-	    if grep 'psip0.*default' /etc/inet.conf >/dev/null
+	    if grep -s 'psip0.*default' /etc/inet.conf 
 	    then	ifconfig -h 10.0.0.1
 	    else	daemonize dhcpd
 	    fi
 	    daemonize nonamed
-	    daemonize talkd
-	    daemonize tcpd shell in.rshd
-	    daemonize tcpd login in.rlogind
-	    daemonize tcpd telnet in.telnetd
-	    daemonize tcpd ftp in.ftpd
+	    if [ -f "$DAEMONS" ]
+	    then	. "$DAEMONS"
+	    fi
 	    # The last daemon has been started, so close the list:
 	    echo .
 	fi