Added a new flag variable to /etc/netstart, $sendmail_flags, which

gives the flags to be passed to sendmail when it is started.  (If it is
"NO", sendmail is not started.)  Also, always start the portmapper regardless
of the value of $nfs_server; this should prevent the inetd complaints we
have seen from recurring.

2 files changed, 16 insertions, 4 deletions

diff --git a/etc/netstart b/etc/netstart
index 74e315c88d6a..26300c22839f 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,10 +1,12 @@
 #!/bin/sh -
 #
-#	@(#)netstart	5.9 (Berkeley) 3/30/91
+#	$Id$
+#	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 routedflags=-q
 timedflags=NO
 rwhod=NO
+sendmail_flags="-bd -q30m"
 #kerberos_server=YES
 #nfs_server=YES
 #name_server=YES
diff --git a/etc/rc b/etc/rc
index 85715719de71..5965439b4072 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,6 @@
-#	@(#)rc	5.27 (Berkeley) 6/5/91
+#!/bin/sh
+#	$Id$
+#	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -151,15 +153,23 @@ fi
 
 echo -n ' printer';		lpd
 
+# Portmapper should always be run, to provide RPC services for inetd.
+if [ -x /usr/sbin/portmap ]; then
+	echo -n ' portmap';		portmap
+fi
 
 if [ X${nfs_server} = X"YES" -a -r /etc/exports ]; then
-	echo -n ' portmap';		portmap
 	echo -n ' mountd';		mountd
 	echo -n ' nfsd';		nfsd -u 0,0,4 -t 0,0
 	echo -n ' nfsiod';		nfsiod 4
 fi
 
-echo -n ' sendmail';		sendmail -bd -q30m
+# $sendmail_flags is imported from /etc/netstart;
+# if $sendmail_flags is something other than NO, sendmail is run.
+if [ X${sendmail_flags} = X"NO" -a -r /etc/sendmail.cf ]; then
+	echo -n ' sendmail';		sendmail ${sendmail_flags} 
+fi
+
 echo -n ' inetd';		inetd
 echo '.'