From 39ccdf1ead14b1b1dee12c70c4decdec04a15f72 Mon Sep 17 00:00:00 2001
From: mcbride <>
Date: Fri, 2 Jun 2006 19:59:35 +0000
Subject: [PATCH] Carp demotion interlock. Prevents carp from preempting until
 the system is booted, allowing for daemons to sync with peers before we take
 over.

ok deraadt@ mpf@ moritz@
---
 src/etc/rc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/etc/rc b/src/etc/rc
index 76abe12d..88eb3498 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -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 @@ sysctl_conf
 
 # 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 @@ fi
 
 echo -n ' cron';		cron
 
+# disable carp interlock
+ifconfig -g carp -carpdemote
+
 echo '.'
 
 date
@@ -772,5 +776,6 @@ if [ X"${xdm_flags}" != X"NO" ]; then
 	echo 'starting xdm...';		/usr/X11R6/bin/xdm ${xdm_flags}
 fi
 
+
 exit 0