Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/etc/rc.conf,v
rcsdiff: /ftp/cvs/cvsroot/src/etc/rc.conf,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.22
retrieving revision 1.22.2.3
diff -u -p -r1.22 -r1.22.2.3
--- src/etc/rc.conf	1997/10/10 09:37:59	1.22
+++ src/etc/rc.conf	1997/11/28 19:53:22	1.22.2.3
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf,v 1.22 1997/10/10 09:37:59 drochner Exp $
+#	$NetBSD: rc.conf,v 1.22.2.3 1997/11/28 19:53:22 mellon Exp $
 #
 # see rc.conf(5) for more information.
 
@@ -19,6 +19,10 @@ defaultroute=""					# if blank, use /etc
 # Filesystems (besides /usr and /var) to mount early in boot-up
 critical_filesystems=""
 
+# Set this to YES if you have purposefully setup no swap partitions and
+# don't want to be warned about it
+no_swap=""
+
 # One-time actions and programs on boot-up.
 lkm=YES						# run /etc/rc.lkm
 savecore=YES		savecore_flags=""
@@ -31,6 +35,7 @@ auto_ifconfig=YES				# config all avail.
 net_interfaces=""				# used only if above is NO
 flushroutes=YES					# flush routes in netstart
 ntpdate=NO		ntpdate_hosts=""	# blank: hosts in /etc/ntp.conf
+ppp_peers=""					# /etc/ppp/peers to call
 
 # Daemons required by other daemons
 inetd=YES		inetd_flags="-l"	# -l logs libwrap
@@ -57,6 +62,10 @@ dhcpd=NO		dhcpd_flags=""
 rbootd=NO		rbootd_flags=""
 mopd=NO			mopd_flags="-a"
 
+# X11 daemons:
+xfs=NO			xfs_flags=""		# X11 font server
+xdm=NO			xdm_flags=""		# x11 display manager
+
 # YP (NIS) daemons
 ypbind=NO		ypbind_flags=""
 ypserv=NO		ypserv_flags="-d"