From be99f93d5de2a426e75703f8e0c98b6224faee78 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 4 Dec 2009 21:58:41 +0000
Subject: [PATCH] use mv -f to avoid stopping during wrongly mounted root;
 sbeyer@reactor.de

---
 src/etc/rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index b999623c..73e961be 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.333 2009/11/23 12:14:25 deraadt Exp $
+#	$OpenBSD: rc,v 1.334 2009/12/04 21:58:41 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -292,7 +292,7 @@ sysctl_conf
 echo 'starting network'
 ifconfig -g carp carpdemote 128
 if [ -f /etc/resolv.conf.save ]; then
-	mv /etc/resolv.conf.save /etc/resolv.conf
+	mv -f /etc/resolv.conf.save /etc/resolv.conf
 	touch /etc/resolv.conf
 fi
 . /etc/netstart