Add portmapflags and syslogd flags.

Reviewed by:	jkh

1 files changed, 17 insertions, 11 deletions

diff --git a/etc/rc b/etc/rc
index c64b5e91..d100dad 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.113 1997/02/23 09:20:46 peter Exp $
+#	$Id: rc,v 1.114 1997/03/16 15:26:32 joerg Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -171,14 +171,19 @@ echo 'recording kernel -c changes'
 #
 echo -n starting system daemons:
 
-# Transitional symlink (for the next couple of years :) until all
-# binaries had a chance to move towards /var/run/log.
-if [ ! -h /dev/log ] ; then
-	# might complain for r/o root f/s
-	ln -sf /var/run/log /dev/log
+# If syslogdflags == NO, syslog isn't run
+if [ "X${syslogdflags}" != X"NO" ] ; then
+
+	# Transitional symlink (for the next couple of years :) until all
+	# binaries had a chance to move towards /var/run/log.
+	if [ ! -h /dev/log ] ; then
+		# might complain for r/o root f/s
+		ln -sf /var/run/log /dev/log
+	fi
+
+	rm -f /var/run/log
+	echo ' syslogd.';		syslogd ${syslogdflags}
 fi
-rm -f /var/run/log
-echo ' syslogd.';			syslogd
 
 echo -n starting early network daemons:
 
@@ -207,12 +212,13 @@ fi
 # $timedflags is imported from /etc/sysconfig;
 # if $timedflags == NO, timed isn't run.
 if [ "X${timedflags}" != X"NO" ]; then
-	echo -n ' timed'; timed $timedflags
+	echo -n ' timed';		timed ${timedflags}
 fi
 
 # Portmapper should always be run, to provide RPC services for inetd.
-if [ -x /usr/sbin/portmap ]; then
-	echo -n ' portmap';		portmap
+# if $portmapflags == NO, portmap isn't run.
+if [ -x /usr/sbin/portmap -a "X${portmapflags}" != X"NO" ]; then
+	echo -n ' portmap';		portmap ${portmapflags}
 fi
 
 # Start ypserv if we're an NIS server.