diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-07-15 08:49:50 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-07-15 08:49:50 +0000 |
| commit | 042f3f4afd73b288f5835224f13cc8571b0ca69d (patch) | |
| tree | 052914555d7c24a587b356ac857fc73b01e51149 | |
| parent | Move more user-unmutable files to the base set, as well as all the (diff) | |
| download | wireguard-openbsd-042f3f4afd73b288f5835224f13cc8571b0ca69d.tar.xz wireguard-openbsd-042f3f4afd73b288f5835224f13cc8571b0ca69d.zip | |
Create /etc/sysctl.conf based upon the 3 variables we might want to set
at install time.
ok aja
| -rw-r--r-- | distrib/miniroot/install.sh | 8 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 91c01c07ffc..832d9594464 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.247 2014/04/19 16:50:52 rpe Exp $ +# $OpenBSD: install.sh,v 1.248 2014/07/15 08:49:50 deraadt 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 @@ -310,10 +310,8 @@ fi ) if grep -qs '^rtsol' /mnt/etc/hostname.*; then - sed -e "/^#\(net\.inet6\.ip6\.accept_rtadv\)/s//\1/" \ - -e "/^#\(net\.inet6\.icmp6\.rediraccept\)/s//\1/" \ - /mnt/etc/sysctl.conf >/tmp/sysctl.conf - cp /tmp/sysctl.conf /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. diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index f5f34f1bfee..bea4fb52106 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.780 2014/07/13 21:24:43 rpe Exp $ +# $OpenBSD: install.sub,v 1.781 2014/07/15 08:49:50 deraadt Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -1815,9 +1815,8 @@ apply() fi if [[ -n $aperture ]]; then - sed "s/^#\(machdep\.allowaperture=$aperture\)/\1 /" \ - /mnt/etc/sysctl.conf >/tmp/sysctl.conf - cp /tmp/sysctl.conf /mnt/etc/sysctl.conf + echo "machdep.allowaperture=$aperture # See xf86(4)" \ + >>/mnt/etc/sysctl.conf fi if [[ $xdm == y && -x /mnt/usr/X11R6/bin/xdm ]]; then |