From e073c9beeeafbdbe7c0d70701efd2d1c3f3abc99 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sat, 9 Apr 2005 14:15:18 +0000
Subject: [PATCH] if, at boot time, a /etc/resolv.conf.save is found, assume
 this is from a dhclient that crashed so hard it was unable to swap the file
 back, and hence, finish that job.  i convinced krw and henning that this is
 right right place (not in netstart)

---
 src/etc/rc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/etc/rc b/src/etc/rc
index d7318578..b27ea88d 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.263 2005/04/01 05:37:35 deraadt Exp $
+#	$OpenBSD: rc,v 1.264 2005/04/09 14:15:18 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -184,6 +184,10 @@ fi
 
 # set hostname, turn on network
 echo 'starting network'
+if [ -f /etc/resolv.conf.save ]; then
+	mv /etc/resolv.conf.save /etc/resolv.conf
+	touch /etc/resolv.conf
+fi
 . /etc/netstart
 
 if [ "X${pf}" != X"NO" ]; then