From 406fab58af87ad21f7cfc0f70ac8d3729d0f31d7 Mon Sep 17 00:00:00 2001
From: Paul Traina <pst@FreeBSD.org>
Date: Tue, 1 Apr 1997 01:00:35 +0000
Subject: [PATCH] Add portmapflags and syslogd flags. Reviewed by:	jkh

---
 etc/rc        | 28 +++++++++++++++++-----------
 etc/sysconfig |  8 +++++++-
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/etc/rc b/etc/rc
index c64b5e9199c..d100dad5dcb 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.
diff --git a/etc/sysconfig b/etc/sysconfig
index 8bd339a61bb..3ea1f001e56 100644
--- a/etc/sysconfig
+++ b/etc/sysconfig
@@ -4,7 +4,7 @@
 # This is sysconfig - a file full of useful variables that you can set 
 # to change the default startup behavior of your system.
 #
-#	$Id: sysconfig,v 1.60 1997/02/23 09:20:54 peter Exp $
+#	$Id: sysconfig,v 1.61 1997/03/16 15:26:34 joerg Exp $
 
 ######################### Start Of Local Configuration Section ###########
 
@@ -171,6 +171,9 @@ ipxrouted=NO
 # timed flags, or NO if you don't want to start the time daemon
 timedflags=NO
 
+# portmap flags, or NO if you don't want to start the portmap daemon
+portmapflags=""
+
 # xntpd flags, or NO if you don't want to start the xntpd daemon
 xntpdflags="NO"
 
@@ -221,6 +224,9 @@ ypxfrdflags="NO"
 # Typical flags might be "-t /var/yp/master.passwd -s -f"
 yppasswddflags="NO"
 
+# syslogd flags, or NO if you don't want to start the syslog daemon
+syslogdflags=""
+
 # Set to appropriate flags for named, if you have a full-time
 # connection to the Internet.
 # For most hosts, flags should be "-b /etc/namedb/named.boot"