===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.287
retrieving revision 1.288
diff -c -r1.287 -r1.288
*** src/etc/rc	2006/06/02 21:32:50	1.287
--- src/etc/rc	2006/08/04 11:43:43	1.288
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.287 2006/06/02 21:32:50 mcbride Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.288 2006/08/04 11:43:43 markus Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 307,314 ****
  	fi
  fi
  
- # $named_flags is imported from /etc/rc.conf;
- # if $named_flags != NO, named is run.
  if [ X"${named_flags}" != X"NO" ]; then
  	if ! cmp -s /etc/rndc.key /var/named/etc/rndc.key ; then
  		echo -n "rndc-confgen: generating new shared secret... "
--- 307,312 ----
***************
*** 323,343 ****
  	echo 'starting named';		named $named_flags
  fi
  
- # $sasyncd_flags is imported from /etc/rc.conf;
- # If $sasyncd_flags == NO, sasyncd isn't run.
  if [ X"${sasyncd_flags}" != X"NO" ]; then
  	echo 'starting sasyncd';	sasyncd ${sasyncd_flags}
  fi
  
- # $isakmpd_flags is imported from /etc/rc.conf;
- # If $isakmpd_flags == NO, isakmpd isn't run.
  if [ X"${isakmpd_flags}" != X"NO" ]; then
  	echo 'starting isakmpd';	isakmpd ${isakmpd_flags}
  fi
  
- # $ipsec is imported from /etc/rc.conf;
- # if $ipsec == NO or /etc/ipsec.conf doesn't exist, then
- # ipsecctl isn't run.
  if [ X"${ipsec}" != X"NO" ]; then
  	if [ -f ${ipsec_rules} ]; then
  		ipsecctl -f ${ipsec_rules}
--- 321,334 ----
***************
*** 346,353 ****
  
  echo -n 'starting initial daemons:'
  
- # $portmap is imported from /etc/rc.conf;
- # if $portmap == YES, the portmapper is started.
  if [ X"${portmap}" = X"YES" ]; then
  	echo -n ' portmap';		portmap
  fi
--- 337,342 ----
***************
*** 384,391 ****
  	fi
  fi
  
- # $nfs_server is imported from /etc/rc.conf;
- # if $nfs_server == YES, the machine is setup for being an nfs server
  if [ X"${nfs_server}" = X"YES" -a -s /etc/exports -a \
      `sed -e '/^#/d' < /etc/exports | wc -l` -ne 0 ]; then
  	rm -f /var/db/mountdtab
--- 373,378 ----
***************
*** 408,415 ****
  	echo -n ' rdate';	rdate -s ${rdate_flags}
  fi
  
- # $timed_flags is imported from /etc/rc.conf;
- # if $timed_flags == NO, timed isn't run.
  if [ X"${timed_flags}" != X"NO" ]; then
  	echo -n ' timed'; timed $timed_flags
  fi
--- 395,400 ----
***************
*** 566,579 ****
  
  echo -n starting network daemons:
  
- # $routed_flags are imported from /etc/rc.conf.
- # If $routed_flags == NO, routed isn't run.
  if [ X"${routed_flags}" != X"NO" ]; then
  	echo -n ' routed';		routed $routed_flags
  fi
  
- # $mrouted_flags is imported from /etc/rc.conf;
- # If $mrouted_flags == NO, then mrouted isn't run.
  if [ X"${mrouted_flags}" != X"NO" ]; then
  	echo -n ' mrouted';		mrouted $mrouted_flags
  fi
--- 551,560 ----
***************
*** 590,597 ****
  	echo -n ' bgpd';		/usr/sbin/bgpd $bgpd_flags
  fi
  
- # $dhcpd_flags is imported from /etc/rc.conf
- # If $dhcpd_flags == NO or /etc/dhcpd.conf doesn't exist, then dhcpd isn't run.
  if [ X"${dhcpd_flags}" != X"NO" -a -f /etc/dhcpd.conf ]; then
  	touch /var/db/dhcpd.leases
  	if [ -f /etc/dhcpd.interfaces ]; then
--- 571,576 ----
***************
*** 607,627 ****
  if ifconfig lo0 inet6 >/dev/null 2>&1; then
  	fw=`sysctl -n net.inet6.ip6.forwarding`
  	if [ X"${fw}" = X"0" ]; then
- 		# $rtsold_flags is imported from /etc/rc.conf;
- 		# If $rtsold_flags == NO, then rtsold isn't run.
  		if [ X"${rtsold_flags}" != X"NO" ]; then
  			echo -n ' rtsold'
  			/usr/sbin/rtsold ${rtsold_flags}
  		fi
  	else
- 		# $route6d_flags is imported from /etc/rc.conf;
- 		# If $route6d_flags == NO, then route6d isn't run.
  		if [ X"${route6d_flags}" != X"NO" ]; then
  			echo -n ' route6d'
  			/usr/sbin/route6d ${route6d_flags}
  		fi
- 		# $rtadvd_flags is imported from /etc/rc.conf;
- 		# If $rtadvd_flags == NO, then rtadvd isn't run.
  		if [ X"${rtadvd_flags}" != X"NO" ]; then
  			echo -n ' rtadvd'
  			/usr/sbin/rtadvd ${rtadvd_flags}
--- 586,600 ----
***************
*** 633,640 ****
  	echo -n ' hostapd';		/usr/sbin/hostapd ${hostapd_flags};
  fi
  
- # $rwhod is imported from /etc/rc.conf;
- # if $rwhod == YES, rwhod is run.
  if [ X"${rwhod}" = X"YES" ]; then
  	echo -n ' rwhod';		rwhod
  fi
--- 606,611 ----
***************
*** 644,653 ****
  	echo -n ' lpd';			lpd ${lpd_flags}
  fi
  
! # $sendmail_flags is imported from /etc/rc.conf;
! # If $sendmail_flags == NO or /etc/mailer.conf doesn't exist, then
! # sendmail isn't run.  We call sendmail with a full path so that
! # SIGHUP works.  Note that /usr/sbin/sendmail may actually call a
  # mailer other than sendmail, depending on /etc/mailer.conf.
  if [ X"${sendmail_flags}" != X"NO" -a -s /etc/mailer.conf ]; then
  	echo -n ' sendmail';		( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & )
--- 615,622 ----
  	echo -n ' lpd';			lpd ${lpd_flags}
  fi
  
! # We call sendmail with a full path so that SIGHUP works.
! # Note that /usr/sbin/sendmail may actually call a
  # mailer other than sendmail, depending on /etc/mailer.conf.
  if [ X"${sendmail_flags}" != X"NO" -a -s /etc/mailer.conf ]; then
  	echo -n ' sendmail';		( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & )
***************
*** 691,720 ****
  	fi
  fi
  
- # $rarpd_flags is imported from /etc/rc.conf;
- # If $rarpd_flags == NO or /etc/ethers doesn't exist, then
- # rarpd isn't run.
  if [ X"${rarpd_flags}" != X"NO" -a -s /etc/ethers ]; then
  	echo -n ' rarpd';		rarpd ${rarpd_flags}
  fi
  
- # $bootparamd_flags is imported from /etc/rc.conf;
- # If $bootparamd_flags == NO or /etc/bootparams doesn't exist, then
- # bootparamd isn't run.
  if [ X"${bootparamd_flags}" != X"NO" -a -s /etc/bootparams ]; then
  	echo -n ' rpc.bootparamd';	rpc.bootparamd ${bootparamd_flags}
  fi
  
- # $rbootd_flags is imported from /etc/rc.conf;
- # If $rbootd_flags == NO or /etc/rbootd.conf doesn't exist, then
- # rbootd isn't run.
  if [ X"${rbootd_flags}" != X"NO" -a -s /etc/rbootd.conf ]; then
  	echo -n ' rbootd';		rbootd ${rbootd_flags}
  fi
  
- # $mopd_flags is imported from /etc/rc.conf;
- # If $mopd_flags == NO or /tftpboot/mop doesn't exist, then
- # mopd isn't run.
  if [ X"${mopd_flags}" != X"NO" -a -d /tftpboot/mop ]; then
  	echo -n ' mopd';		mopd ${mopd_flags}
  fi
--- 660,677 ----
***************
*** 742,749 ****
  
  echo -n standard daemons:
  
- # $apmd_flags is imported from /etc/rc.conf;
- # don't run daemon if $apmd_flags == NO or /usr/sbin/apmd doesn't exist
  if [ X"${apmd_flags}" != X"NO" -a -x /usr/sbin/apmd ]; then
  	echo -n ' apmd';	/usr/sbin/apmd ${apmd_flags}
  fi
--- 699,704 ----
***************
*** 782,787 ****
  	echo 'starting xdm...';		/usr/X11R6/bin/xdm ${xdm_flags}
  fi
  
- 
  exit 0
- 
--- 737,740 ----