summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2012-11-06 17:49:40 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2012-11-06 17:49:40 +0000
commit56544f627f9a15d89695939f8c845f0a791f87b0 (patch)
tree7e5bc62d101a1c6dbb69f4a8d9f665e3f51fd346
parent3ce9f89c00978186a4675cd9d0613efe2c813cfb (diff)
Always setup lo0 with 127.0.0.1/8 when configuring the network,
whether installing or upgrading. ok deraadt@
-rw-r--r--distrib/miniroot/install.sub8
1 files changed, 4 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 6576e59ea1c..c2cc68ba1b4 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.670 2012/10/21 06:41:14 deraadt Exp $
+# $OpenBSD: install.sub,v 1.671 2012/11/06 17:49:39 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -571,6 +571,9 @@ configure_ifs() {
done
_vd=
+ # Always need lo0 configured.
+ ifconfig lo0 inet 127.0.0.1/8
+
while :; do
# Create new vlan if possible.
ifconfig vlan$_vl create >/dev/null 2>&1
@@ -1364,9 +1367,6 @@ install_url() {
fi
_url_base=$_url_base$_server_ip/$_server_dir
- # XXX Workaround for problems ftp'ing out from a v6 only host.
- ifconfig lo0 127.0.0.1
-
# Get list of files from the server.
if [[ $_url_type == ftp && -z $ftp_proxy ]] ; then
_file_list=$(ftp -V "$_url_base/")