diff options
| author |   naddy <naddy@openbsd.org> | 2014-07-21 20:34:14 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2014-07-21 20:34:14 +0000 |
| commit | e765035c3a7ab025b23799834f738e8c721c7269 (patch) | |
| tree | 004392c056e9e44be818ea273880317a3221f490 | |
| parent | Use explicit_bzero() instead of memset() on buffers going out of scope. (diff) | |
| download | wireguard-openbsd-e765035c3a7ab025b23799834f738e8c721c7269.tar.xz wireguard-openbsd-e765035c3a7ab025b23799834f738e8c721c7269.zip | |
Since net.inet6.ip6.accept_rtadv is gone, the installer shouldn't
set it. Provisionally drop net.inet6.icmp6.rediraccept, too.
| -rw-r--r-- | distrib/miniroot/install.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index f53569691dc..bfa52c0f23a 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.249 2014/07/16 08:27:14 ajacoutot Exp $ +# $OpenBSD: install.sh,v 1.250 2014/07/21 20:34:14 naddy Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -309,12 +309,5 @@ fi print -r -- "$rootkey" >> /mnt/root/.ssh/authorized_keys ) -if grep -qs '^rtsol' /mnt/etc/hostname.*; then - [[ ! -f /mnt/etc/sysctl.conf ]] && \ - echo "# created during install" >/mnt/etc/sysctl.conf - echo 'net.inet6.ip6.accept_rtadv=1 # 1=Permit IPv6 autoconf (forwarding must be 0)' >>/mnt/etc/sysctl.conf - echo 'net.inet6.icmp6.rediraccept=1 # 1=Accept IPv6 ICMP redirects (for hosts)' >>/mnt/etc/sysctl.conf -fi - # Perform final steps common to both an install and an upgrade. finish_up |