diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2015-12-17 23:19:23 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2015-12-17 23:19:23 +0000 |
| commit | 0f5cac083173503924b4afa33df91ead62a5166d (patch) | |
| tree | 241993b4cd09093a0abccfc4e33f4d1a5a71f5b4 | |
| parent | As well as setting up the state, actually use it in cmd_find_target. (diff) | |
| download | wireguard-openbsd-0f5cac083173503924b4afa33df91ead62a5166d.tar.xz wireguard-openbsd-0f5cac083173503924b4afa33df91ead62a5166d.zip | |
Simplify multicast option handling (10 less lines) by matching /etc/rc behavior
towards other YES|NO options and drop the error warning.
with and ok tim@, ok rpe@ on an earlier diff
| -rw-r--r-- | etc/netstart | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/etc/netstart b/etc/netstart index b32143542e8..a50cc1a3fb5 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.163 2015/12/05 18:43:12 mpi Exp $ +# $OpenBSD: netstart,v 1.164 2015/12/17 23:19:23 ajacoutot Exp $ # Turn off Strict Bourne shell mode. set +o sh @@ -275,18 +275,8 @@ done # YES none installed daemon can run # Any other combination -reject config error route -qn delete 224.0.0.0/4 >/dev/null 2>&1 -case $multicast in -NO) +[[ $multicast != YES ]] && \ route -qn add -net 224.0.0.0/4 -interface 127.0.0.1 -reject >/dev/null - ;; -YES) - ;; -*) - echo 'config error, multicasting disabled until rc.conf is fixed' - route -qn add -net 224.0.0.0/4 -interface 127.0.0.1 -reject >/dev/null - ;; -esac - # 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 |