diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-10-26 00:06:52 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-10-26 00:06:52 +0000 |
| commit | b751da7572d51540a35410f004c5b56dc2ce10d8 (patch) | |
| tree | 3a4dd3ff860d6849bbc8bb5dfeb8c6161aac7147 /distrib/miniroot/install.sub | |
| parent | 28d1e4c3e6a28b65b8a2fd722da39779418752c5 (diff) | |
Sync mygate handling with latest netstart changes so upgrades work.
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 6ea60119941..0f6500fbb0f 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.396 2005/10/20 02:31:52 krw Exp $ +# $OpenBSD: install.sub,v 1.397 2005/10/26 00:06:51 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2005 Todd Miller, Theo de Raadt, Ken Westerback @@ -172,6 +172,9 @@ __EOT # '#'. i.e. strip comment lines from the file. stripcom () { local _l + + [[ -f $1 ]] || return + while read _l; do [[ -n ${_l%%#*} ]] && echo $_l done <$1 @@ -725,7 +728,7 @@ v6_config() { v6_defroute $_ifs [[ $resp == none ]] && return route -n add -inet6 -host default "$resp" || return - echo "!route -qn add -host -inet6 default $resp" >>$_hn + echo "$resp" >>/tmp/mygate } v4_defroute() { @@ -778,7 +781,7 @@ v6_defroute() { # Much of this is gratuitously stolen from /etc/netstart. enable_network() { - local _netfile + local _netfile _gw # Copy any required or optional files found for _netfile in hosts dhclient.conf resolv.conf resolv.conf.tail protocols services; do @@ -883,12 +886,19 @@ enable_network() { [[ -n $rtsolif ]] && /mnt/sbin/rtsol -F $rtsolif - # /mnt/etc/mygate contains the address of my gateway host. Ignore - # it if any interfaces attempted dhcp. - if [[ -z $dhcpif && -f /mnt/etc/mygate ]]; then - route delete default >/dev/null 2>&1 - route -qn add -host default $(stripcom /mnt/etc/mygate) - fi + # /mnt/etc/mygate, if it exists, contains the address(es) of my + # default gateway(s). Use for ipv4 if no interfaces configured via + # dhcp. Use for ipv6 if no interfaces configured via rtsol. + [[ -z $dhcpif ]] && stripcom /mnt/etc/mygate | while read _gw; do + [[ $_gw == @(*:*) ]] && continue + route -qn delete default >/dev/null 2>&1 + route -qn add -host default $_gw && break + done + [[ -z $rtsolif ]] && stripcom /mnt/etc/mygate | while read _gw; do + [[ $_gw == !(*:*) ]] && continue + route -qn delete -inet6 default >/dev/null 2>&1 + route -qn add -host -inet6 default $_gw && break + done # Use loopback, not the wire. route -qn add -host `hostname` 127.0.0.1 >/dev/null |