===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.378
retrieving revision 1.379
diff -c -r1.378 -r1.379
*** src/etc/rc	2011/07/08 04:54:12	1.378
--- src/etc/rc	2011/07/08 09:48:18	1.379
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.378 2011/07/08 04:54:12 robert Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.379 2011/07/08 09:48:18 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 414,421 ****
  
  make_keys
  
! echo -n 'starting system logger:'
! start_daemon syslogd
  
  if [ X"${pf}" != X"NO" ]; then
  	ifconfig pflog0 create >/dev/null 2>&1
--- 414,421 ----
  
  make_keys
  
! echo -n 'starting early daemons:'
! start_daemon syslogd ldattach
  
  if [ X"${pf}" != X"NO" ]; then
  	ifconfig pflog0 create >/dev/null 2>&1
***************
*** 425,461 ****
  	fi
  fi
  
  echo '.'
  
- echo -n 'starting name service daemons:'
- start_daemon named nsd
- echo '.'
- 
- echo -n 'starting IPsec daemons:'
- start_daemon isakmpd iked sasyncd
- echo '.'
- 
  if [ X"${ipsec}" != X"NO" ]; then
  	if [ -f ${ipsec_rules} ]; then
  		ipsecctl -f ${ipsec_rules}
  	fi
  fi
  
! echo -n 'starting initial daemons:'
! 
  start_daemon portmap
  if [ X"`domainname`" != X"" ]; then
  	start_daemon ypserv ypldap ypbind yppasswdd
  fi
  start_daemon mountd nfsd lockd statd amd
- 
- # run rdate before ntpd
- if [ X"${rdate_flags}" != X"NO" ]; then
- 	echo -n ' rdate';	rdate -s ${rdate_flags}
- fi
- 
- start_daemon ldattach ntpd
- 
  echo '.'
  
  mount -a
--- 425,445 ----
  	fi
  fi
  
+ start_daemon named nsd ntpd isakmpd iked sasyncd
  echo '.'
  
  if [ X"${ipsec}" != X"NO" ]; then
  	if [ -f ${ipsec_rules} ]; then
  		ipsecctl -f ${ipsec_rules}
  	fi
  fi
  
! echo -n 'starting RPC daemons:'
  start_daemon portmap
  if [ X"`domainname`" != X"" ]; then
  	start_daemon ypserv ypldap ypbind yppasswdd
  fi
  start_daemon mountd nfsd lockd statd amd
  echo '.'
  
  mount -a
***************
*** 535,544 ****
  echo 'preserving editor files.';	/usr/libexec/vi.recover
  
  echo -n 'starting network daemons:'
  
- start_daemon sshd snmpd ldpd ripd bgpd ifstated relayd dhcpd \
- 	dhcrelay mrouted dvmrpd
- 
  if ifconfig lo0 inet6 >/dev/null 2>&1; then
  	fw=`sysctl -n net.inet6.ip6.forwarding`
  	if [ X"${fw}" = X"0" ]; then
--- 519,527 ----
  echo 'preserving editor files.';	/usr/libexec/vi.recover
  
  echo -n 'starting network daemons:'
+ start_daemon sshd snmpd ldpd ripd bgpd ifstated relayd dhcpd
+ start_daemon dhcrelay mrouted dvmrpd
  
  if ifconfig lo0 inet6 >/dev/null 2>&1; then
  	fw=`sysctl -n net.inet6.ip6.forwarding`
  	if [ X"${fw}" = X"0" ]; then
***************
*** 550,566 ****
  
  start_daemon hostapd rwhod lpd ldapd sendmail smtpd httpd ftpd
  start_daemon ftpproxy identd inetd rarpd bootparamd rbootd mopd
! start_daemon spamd spamlogd
! 
  echo '.'
  
! [ X"${spamd_flags}" != X"NO" ] && \
  	/usr/libexec/spamd-setup -D
- 
- if [ X"${kdc_flags}" != X"NO" ]; then
- 	echo -n 'starting KerberosV daemons:'
- 	start_daemon kdc kadmind kpasswdd
- 	echo '.'
  fi
  
  # If rc.firstime exists, run it just once, and make sure it is deleted
--- 533,543 ----
  
  start_daemon hostapd rwhod lpd ldapd sendmail smtpd httpd ftpd
  start_daemon ftpproxy identd inetd rarpd bootparamd rbootd mopd
! start_daemon spamd spamlogd kdc kadmind kpasswdd
  echo '.'
  
! if [ X"${spamd_flags}" != X"NO" ]; then
  	/usr/libexec/spamd-setup -D
  fi
  
  # If rc.firstime exists, run it just once, and make sure it is deleted
***************
*** 582,602 ****
  
  [ -f /etc/rc.local ] && . /etc/rc.local
  
! echo -n 'starting standard daemons:'
  
- start_daemon apmd sensorsd hotplugd watchdogd cron
- 
- # disable carp interlock
- ifconfig -g carp -carpdemote 128
- 
- echo '.'
- 
- date
- 
  mixerctl_conf
! 
! echo -n 'starting console services:'
! start_daemon aucat wsmoused xdm
  echo '.'
  
  exit 0
--- 559,570 ----
  
  [ -f /etc/rc.local ] && . /etc/rc.local
  
! ifconfig -g carp -carpdemote 128	# disable carp interlock
  
  mixerctl_conf
! echo -n 'starting local daemons:'
! start_daemon apmd sensorsd hotplugd watchdogd cron aucat wsmoused xdm
  echo '.'
  
+ date
  exit 0