===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- src/etc/rc	2006/06/01 21:37:43	1.285
+++ src/etc/rc	2006/06/02 19:59:35	1.286
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.285 2006/06/01 21:37:43 norby Exp $
+#	$OpenBSD: rc,v 1.286 2006/06/02 19:59:35 mcbride Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -244,6 +244,7 @@
 
 # set hostname, turn on network
 echo 'starting network'
+ifconfig -g carp carpdemote
 if [ -f /etc/resolv.conf.save ]; then
 	mv /etc/resolv.conf.save /etc/resolv.conf
 	touch /etc/resolv.conf
@@ -759,6 +760,9 @@
 
 echo -n ' cron';		cron
 
+# disable carp interlock
+ifconfig -g carp -carpdemote
+
 echo '.'
 
 date
@@ -771,6 +775,7 @@
 if [ X"${xdm_flags}" != X"NO" ]; then
 	echo 'starting xdm...';		/usr/X11R6/bin/xdm ${xdm_flags}
 fi
+
 
 exit 0