diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-12-05 18:43:13 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-12-05 18:43:13 +0000 |
| commit | 04f25fc2014eff7d14a08f79724dfd7425880ca8 (patch) | |
| tree | 1439ed790debac35f5d95a4723d1201a221db410 /etc/rc.d | |
| parent | d68eb0c43c9011470ea5a0571376c43201aa8951 (diff) | |
It does not make sense to insert a specific route for 224/4 when the
default one is good enough.
So merge rc.conf(8)'s 'multicast_router' and 'multicast_host' into a
single 'multicast'. If set to YES the reject route for 224/4 is not
inserted by netstart(8).
Manual bits from jmc@
ok henning@, ajacoutot@
Diffstat (limited to 'etc/rc.d')
| -rw-r--r-- | etc/rc.d/rc.subr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr index 18957bf144b..a5c334c52ef 100644 --- a/etc/rc.d/rc.subr +++ b/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.100 2015/10/16 20:12:00 ajacoutot Exp $ +# $OpenBSD: rc.subr,v 1.101 2015/12/05 18:43:12 mpi Exp $ # # Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -124,7 +124,7 @@ _rc_parse_conf() { local _l _rcfile _val set -A _allowed_keys -- \ spamd_black pf ipsec check_quotas accounting \ - multicast_host multicast_router amd_master \ + multicast amd_master \ shlib_dirs pkg_scripts nfs_server [ $# -gt 0 ] || set -- /etc/rc.conf /etc/rc.conf.local |