diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-02-08 11:31:44 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-02-08 11:31:44 +0000 |
| commit | 3122ef35b6364bb44c3ab3dff88dbec1c88ea27c (patch) | |
| tree | 87b7059a9d8ce21723069d0557246fbb29411fa3 /distrib/miniroot | |
| parent | c5fd15f3a2940d81a37fd04e955a0c6aee1daca9 (diff) | |
Add loopback routes late during upgrades, as /etc/netstart does now.
Scavange a couple of characters while in the area.
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index bf9db6a82e5..5174c3cdfbb 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.327 2004/02/08 01:01:10 krw Exp $ +# $OpenBSD: install.sub,v 1.328 2004/02/08 11:31:43 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback @@ -648,13 +648,10 @@ enable_network() { DIDNET=y - # set the address for the loopback interface + # Set the address for the loopback interface. Bringing the + # interface up, automatically invokes the IPv6 address ::1. ifconfig lo0 inet localhost - # use loopback, not the wire - route -n add -host `hostname` localhost > /dev/null - route -n add -net 127 127.0.0.1 -reject > /dev/null - # configure all of the non-loopback interfaces which we know about. # refer to hostname.if(5) for hn in /mnt/etc/hostname.*; do @@ -744,16 +741,20 @@ enable_network() { ;; esac eval "$cmd" - done < /mnt/etc/hostname.$if + done </mnt/etc/hostname.$if done # /mnt/etc/mygate, if it exists, contains the name of my gateway host # that name must be in /etc/hosts. if [ -f /mnt/etc/mygate ]; then - route delete default > /dev/null 2>&1 - route -n add -host default `cat /mnt/etc/mygate` + route delete default >/dev/null 2>&1 + route -n add -host default $(< /mnt/etc/mygate) fi + # Use loopback, not the wire. + route -qn add -host `hostname` 127.0.0.1 >/dev/null + route -qn add -net 127 127.0.0.1 -reject >/dev/null + # Display results... echo "Network interface configuration:" ifconfig -am |