diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-03-02 21:18:59 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-03-02 21:18:59 +0000 |
| commit | 54b368c4e9f5d7310129b5079d26619a2b48b14c (patch) | |
| tree | eb5e7e10b262a30aba3021618838bfb470f71296 /distrib | |
| parent | 9b037067ebf9c34dfc2737838efc30377f1d6b05 (diff) | |
Keep resolv.conf.shadow around when restarting an install. This
means manually entered DNS server addresses are not lost when
an install is restarted. Restores behaviour unintentionally lost
with r1.127.
ok deraadt@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index b0679df9ccd..4f30989d81a 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.155 2008/02/11 23:40:03 krw Exp $ +# $OpenBSD: install.sh,v 1.156 2008/03/02 21:18:58 krw Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback @@ -325,8 +325,8 @@ THESETS="$THESETS site$VERSION-$(hostname -s).tgz" # Remove existing network configuration files in /tmp to ensure they don't leak # onto the installed system in the case of a restarted install. Any information # contained within them should be accessible via ifconfig, hostname, route, -# etc. -( cd /tmp; rm -f host* my* resolv.* dhclient.* ) +# etc, or from resolv.conf.shadow. +( cd /tmp; rm -f host* my* resolv.conf resolv.conf.tail dhclient.* ) # Always create new hosts file. cat >/tmp/hosts <<__EOT |