Browse Source

If -n is given, the netstart script should not (try to) set the default

route(s). Simply print the command(s) to be issued instead.
tweak & ok rpe
OPENBSD_6_3
tb 6 years ago
parent
commit
a191b4c4cb
1 changed files with 15 additions and 3 deletions
  1. +15
    -3
      src/etc/netstart

+ 15
- 3
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: netstart,v 1.187 2017/11/12 21:58:00 tb Exp $
# $OpenBSD: netstart,v 1.188 2018/02/06 19:53:50 tb Exp $
# Turn off Strict Bourne shell mode. # Turn off Strict Bourne shell mode.
set +o sh set +o sh
@ -147,15 +147,27 @@ ifmstart() {
# Parse /etc/mygate and add default routes for IPv4 and IPv6 # Parse /etc/mygate and add default routes for IPv4 and IPv6
# Usage: defaultroute # Usage: defaultroute
defaultroute() { defaultroute() {
local _cmd;
! $V4_DHCPCONF && stripcom /etc/mygate | ! $V4_DHCPCONF && stripcom /etc/mygate |
while read gw; do while read gw; do
[[ $gw == @(*:*) ]] && continue [[ $gw == @(*:*) ]] && continue
route -qn add -host default $gw && break
_cmd="route -qn add -host default $gw"
if $PRINT_ONLY; then
print -r -- "$_cmd" && break
else
$_cmd && break
fi
done done
! $V6_AUTOCONF && stripcom /etc/mygate | ! $V6_AUTOCONF && stripcom /etc/mygate |
while read gw; do while read gw; do
[[ $gw == !(*:*) ]] && continue [[ $gw == !(*:*) ]] && continue
route -qn add -host -inet6 default $gw && break
_cmd="route -qn add -host -inet6 default $gw"
if $PRINT_ONLY; then
print -r -- "$_cmd" && break
else
$_cmd && break
fi
done done
} }


Loading…
Cancel
Save