Browse Source

Do not try to delete a default route before adding it.

Now that route are automatically G/C with the address they are attached
to there's no reason to duplicate the kernel's job.
Fix a regression introduced with multipath default routes.
ok deraadt@
OPENBSD_6_2
mpi 7 years ago
parent
commit
6dd8be9e0d
1 changed files with 1 additions and 3 deletions
  1. +1
    -3
      src/etc/netstart

+ 1
- 3
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: netstart,v 1.178 2017/04/25 19:17:33 rpe Exp $
# $OpenBSD: netstart,v 1.179 2017/04/30 19:37:13 mpi Exp $
# Turn off Strict Bourne shell mode. # Turn off Strict Bourne shell mode.
set +o sh set +o sh
@ -170,12 +170,10 @@ ifv6autoconf() {
defaultroute() { defaultroute() {
[[ -z $dhcpif ]] && stripcom /etc/mygate | while read gw; do [[ -z $dhcpif ]] && stripcom /etc/mygate | while read gw; do
[[ $gw == @(*:*) ]] && continue [[ $gw == @(*:*) ]] && continue
route -qn delete default >/dev/null 2>&1
route -qn add -host default $gw && break route -qn add -host default $gw && break
done done
[[ -z $rtsolif ]] && stripcom /etc/mygate | while read gw; do [[ -z $rtsolif ]] && stripcom /etc/mygate | while read gw; do
[[ $gw == !(*:*) ]] && continue [[ $gw == !(*:*) ]] && continue
route -qn delete -inet6 default >/dev/null 2>&1
route -qn add -host -inet6 default $gw && break route -qn add -host -inet6 default $gw && break
done done
} }


Loading…
Cancel
Save