diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2016-03-27 20:32:43 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2016-03-27 20:32:43 +0000 |
| commit | 9e13ae50731a6ae36f2c16d80be254a781a5cba7 (patch) | |
| tree | 99eee24d3767ddf2cd60421f5ceea9a397c798f7 /etc | |
| parent | 4b9d4d49fe42fee3a8e8d6c25ae1dea206c3c3f7 (diff) | |
Don't delete the 224/4 route in netstart, unless it's being done to ensure that
a -reject route can be added. Restores the ability to set an interface route
before daemons are started, lost during the previous simplification.
ok millert mpi
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/netstart | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/netstart b/etc/netstart index dd58efa59f7..edb02bca875 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.167 2015/12/29 19:37:31 rpe Exp $ +# $OpenBSD: netstart,v 1.168 2016/03/27 20:32:42 sthen Exp $ # Turn off Strict Bourne shell mode. set +o sh @@ -268,9 +268,10 @@ done done # Multicast routing. -route -qn delete 224.0.0.0/4 >/dev/null 2>&1 -[[ $multicast != YES ]] && +if [[ $multicast != YES ]]; then + route -qn delete 224.0.0.0/4 >/dev/null 2>&1 route -qn add -net 224.0.0.0/4 -interface 127.0.0.1 -reject >/dev/null +fi # Configure PPPoE, GIF, GRE, TUN and PFLOW interfaces, delayed because they # require routes to be set. TUN might depend on PPPoE, and GIF or GRE may |