no need for defaults/rc.conf.

minor whitespace fix.

bump to 20030622.

2 files changed, 1 insertions, 263 deletions

diff --git a/pkgtools/rc.subr/files/defaults/rc.conf b/pkgtools/rc.subr/files/defaults/rc.conf
deleted file mode 100644
index 82bd4c397ef..00000000000
--- a/pkgtools/rc.subr/files/defaults/rc.conf
+++ /dev/null
@@ -1,254 +0,0 @@
-#	$NetBSD: rc.conf,v 1.1.1.1 2003/06/19 16:07:13 grant Exp $
-#
-# /etc/defaults/rc.conf --
-#	default configuration of /etc/rc.conf
-#
-# see rc.conf(5) for more information.
-#
-# DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
-# EDIT /etc/rc.conf INSTEAD.
-#
-# DEVELOPERS:  Please edit share/sushi/system/rcconf/form when modifying this
-# file to keep it in sync.
-
-#
-# Use program=YES to enable program, NO to disable it. program_flags are
-# passed to the program on the command line.
-#
-
-# Uncomment this if you want to use local paths in rc.
-#
-#export PATH=$PATH:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin
-
-# Uncomment the following to execute each /etc/rc.d script in
-# the current shell rather than in a subshell.  This may be
-# faster on very slow machines that have an expensive fork(2).
-#	NOTE:	USE THIS AT YOUR OWN RISK; A ROGUE COMMAND
-#		MAY INADVERTENTLY PREVENT BOOT TO MULTIUSER.
-#
-#rc_fast_and_loose=YES
-
-# Additional flags to the rcorder(8) that's run by /etc/rc.
-#
-rc_rcorder_flags=""
-
-# If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
-#
-do_rcshutdown=YES
-
-# Additional flags to the rcorder(8) that's run by /etc/rc.shutdown.
-#
-rcshutdown_rcorder_flags=""
-
-# If this is non-blank, use as the number of seconds to run a watchdog
-# timer which will terminate /etc/rc.shutdown if the timeout expires.
-#
-rcshutdown_timeout=""
-
-
-# Basic network configuration
-#
-
-# Fully Qualified Internet Domain Name (a.k.a. hostname, e.g. foo.baz.edu).
-# If blank, use /etc/myname.
-#
-hostname=""
-
-# If there's only one way out of your network, set this to the hostname
-# or the IP address of the router that will get your packets off the LAN.
-# If blank, use /etc/mygate.
-#
-defaultroute=""
-
-# The NIS domain name (formerly known as Yellow Pages); not in any way
-# related to Internet domain names.
-# If blank, use /etc/defaultdomain.
-#
-domainname=""
-
-# Filesystems to mount early in boot-up.
-# Note that `/var' is needed in $critical_filesystems_local (or
-# implied as part of `/') as certain services that need /var (such as
-# dhclient) may be needed to get the network operational enough to mount
-# the $critical_filesystems_remote.
-#
-critical_filesystems_local="/var"
-critical_filesystems_remote="/usr"
-
-# Swap device controls.
-#
-no_swap=NO		# Set to YES if you have purposefully setup no swap
-			# partitions and don't want to be warned about it.
-swapoff=NO		# Remove block-type swap partitions upon shutdown
-
-# One-time actions and programs on boot-up.
-#
-lkm=NO						# run /etc/rc.lkm
-savecore=YES		savecore_flags="-z"
-clear_tmp=YES					# clear /tmp after reboot
-update_motd=YES					# updates /etc/motd
-dmesg=YES		dmesg_flags=""		# write /var/run/dmesg.boot
-accounting=NO					# uses /var/account/acct
-newsyslog=NO		newsyslog_flags=""	# trim log files
-
-# NOTE: default coredump name now set in /etc/sysctl.conf
-
-# Security setting.  If $securelevel is non-empty, the system securelevel
-# is set to this value early in the boot sequence.  Otherwise the default
-# action is taken (see init(8)).
-#
-securelevel=""					# securelevel to set to
-
-# To set the IP address of an interface either use
-#  ifconfig_xxN="IP-NO"
-# where xxN is the interface.  If this variable is not set then
-# contents of the file /etc/ifconfig.xxN is used.
-
-# Networking startup.
-#
-ipfilter=NO					# uses /etc/ipf.conf
-ipnat=NO					# uses /etc/ipnat.conf
-ipfs=NO			ipfs_flags=""		# save/load ipnat and ipf states
-ipsec=NO					# uses /etc/ipsec.conf
-ipmon=NO		ipmon_flags="-ns"	# syslog ipfilter messages
-racoon=NO					# IKE daemon
-auto_ifconfig=YES				# config all avail. interfaces
-net_interfaces=""				# used only if above is NO
-flushroutes=YES					# flush routes in netstart
-dhclient=NO					# behave as a DHCP client
-			dhclient_flags=""	# blank: config all interfaces
-ntpdate=NO  		ntpdate_flags="-b -s"	# May need '-u' thru firewall
-ppp_peers=""					# /etc/ppp/peers to call
-ip6mode=host					# host, autohost or router
-ip6sitelocal=NO					# IPv6 sitelocal addrs
-rtsol=NO		rtsol_flags="-a"	# for ip6mode=autohost only
-
-# Special treatment for interfaces that need to be downed on
-# shutdown (because they might cause unecessary costs or block resources
-# on the peer). All pppoe* interfaces are automatically included in this
-# list, add others here manually.
-# force_down_interfaces=""
-
-ifwatchd=NO	# execute up/down scripts for in-kernel PPPoE interfaces
-	ifwatchd_flags="-u /etc/ppp/ip-up -d /etc/ppp/ip-down pppoe0"
-
-# ALTQ configuration/monitoring daemon
-altqd=NO		altqd_flags=""
-
-# Daemons required by servers.  These are not needed for strictly client use.
-#
-
-# inetd is used to start the IP-based services enabled in /etc/inetd.conf
-#
-inetd=YES		inetd_flags="-l"	# -l logs libwrap
-
-# rpcbind (formerly known as 'portmap') is used to look up RPC-based services.
-#
-rpcbind=NO		rpcbind_flags="-l"	# -l logs libwrap
-
-# Commonly used daemons.
-#
-syslogd=YES		syslogd_flags="-s"	# -s "secure" unix domain only
-cron=YES
-named=NO		named_flags=""		# see below for named_chrootdir
-timed=NO		timed_flags=""
-ntpd=NO			ntpd_flags=""		# see below for ntpd_chrootdir
-sendmail=NO		sendmail_flags="-bd -q30m"
-postfix=NO
-lpd=NO			lpd_flags="-s"		# -s "secure" unix domain only
-sshd=NO			sshd_flags=""
-
-# To run the named(8) DNS server as an unprivileged user under a
-# chroot(2) cage, uncomment the following after migrating the contents
-# of /etc/namedb to /var/chroot/named/etc/namedb
-#
-#named_chrootdir="/var/chroot/named"
-
-# To run the ntpd(8) NTP server as an unprivileged user under a
-# chroot(2) cage, uncomment the following, after ensuring that:
-#	- The kernel has "pseudo-device clockctl" compiled in
-#	- /dev/clockctl is present
-#
-#ntpd_chrootdir="/var/chroot/ntpd"
-
-# Routing daemons.
-#
-routed=NO		routed_flags="-q"
-gated=NO
-mrouted=NO		mrouted_flags=""
-route6d=NO		route6d_flags=""
-rtsold=NO		rtsold_flags=""		# for ip6mode=autohost only
-
-# Daemons used to boot other hosts over a network.
-#
-rarpd=NO		rarpd_flags="-a"
-bootparamd=NO		bootparamd_flags=""
-dhcpd=NO		dhcpd_flags="-q"
-dhcrelay=NO		dhcrelay_flags=""
-rbootd=NO		rbootd_flags=""
-mopd=NO			mopd_flags="-a"
-ndbootd=NO		ndbootd_flags="-s /tftpboot /tftpboot/bootyy"
-rtadvd=NO		rtadvd_flags=""
-
-# X11 daemons.
-#
-xfs=NO			xfs_flags=""		# X11 font server
-xdm=NO			xdm_flags=""		# X11 display manager; needs
-						# wscons=YES for local displays.
-
-# YP (NIS) daemons.
-#
-ypbind=NO		ypbind_flags=""
-ypserv=NO		ypserv_flags="-d"
-yppasswdd=NO		yppasswdd_flags=""
-
-# NFS daemons and parameters.
-#
-mountd=NO		mountd_flags=""		# NFS mount requests daemon
-nfs_client=NO					# enable client daemons
-nfs_server=NO					# enable server daemons
-			nfsd_flags="-6tun 4"
-lockd=NO		lockd_flags=""
-statd=NO		statd_flags=""
-amd=NO			amd_flags="-l syslog -x error,noinfo,nostats"
-			amd_dir=/amd			# mount dir
-
-# Heimdal Kerberos 5 KDC (with Kerberos IV compatibility)
-kdc=NO			kdc_flags=""
-
-# ISDN daemon
-isdnd=NO		isdnd_flags=""
-
-# Other daemons.
-#
-rwhod=NO
-
-# Hardware daemons.
-#
-apmd=NO			apmd_flags=""		# APM power management daemon.
-poffd=NO					# x68k power switch monitor
-			poffd_flags="'shutdown -p now'"
-screenblank=NO		screenblank_flags=""	# wscons and FBIO screenblanker
-
-moused=NO					# serial mouse handler
-			moused_flags="-p /dev/tty00"
-
-wdogctl=NO					# watchdog timer control
-#			wdogctl_flags="-k devicename"
-
-# Configuration of "wscons" console driver virtual screens.
-#
-wscons=NO		wscons_flags=""		# setup wscons from wscons.conf
-
-# Configuration of "wsmoused" console driver cut-n-paste support
-#
-wsmoused=NO		wsmoused_flags=""
-
-# Configuration of "tpctl" touch panel calibration utility
-#
-tpctl=NO		tpctl_flags=""
-
-# Mixer setting
-#
-mixerctl=NO		mixerctl_mixers=""	# "mixer0 mixer1" means saving
-						# and restoring their settings
diff --git a/pkgtools/rc.subr/files/rc.conf.example b/pkgtools/rc.subr/files/rc.conf.example
index 85d9c9d6436..4587a01b501 100644
--- a/pkgtools/rc.subr/files/rc.conf.example
+++ b/pkgtools/rc.subr/files/rc.conf.example
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf.example,v 1.1.1.1 2003/06/19 16:07:12 grant Exp $
+#	$NetBSD: rc.conf.example,v 1.2 2003/06/23 07:02:16 grant Exp $
 #
 # see rc.conf(5) for more information.
 #
@@ -6,11 +6,3 @@
 # passed to the program on the command line.
 #
 
-# Load the defaults in from /etc/defaults/rc.conf (if it's readable).
-# These can be overridden below.
-#
-if [ -r /etc/defaults/rc.conf ]; then
-	. /etc/defaults/rc.conf
-fi
-
-rc_configured=YES