diff options
| author | Alexander Hall <halex@cvs.openbsd.org> | 2011-07-04 20:59:06 +0000 |
|---|---|---|
| committer | Alexander Hall <halex@cvs.openbsd.org> | 2011-07-04 20:59:06 +0000 |
| commit | 7219634c1076dcf0a9dff7ddb9a167569bd0b7e3 (patch) | |
| tree | f19dd72e8c1e7fcdf4e4b7422455c19691e3d25e /distrib/miniroot | |
| parent | 0e15a991ae43f9b345c9fc65ca6fcf2901e01658 (diff) | |
there is no need to do the rtsol check (whether to enable
net.inet6.ip6.accept_rtadv in sysctl.conf or not) on updates
as then we dont do any network config, so move it from
install.sub to install.sh
idea not rejected by IPv6-enabled bluhm@
ok krw@ deraadt@
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sh | 8 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index d06cf57fb1f..a2af7462d86 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.220 2011/04/17 21:02:44 krw Exp $ +# $OpenBSD: install.sh,v 1.221 2011/07/04 20:59:05 halex 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 @@ -313,5 +313,11 @@ q" | /mnt/bin/ed /mnt/etc/master.passwd 2>/dev/null fi /mnt/usr/sbin/pwd_mkdb -p -d /mnt/etc /etc/master.passwd +if grep -qs '^rtsol' /mnt/etc/hostname.*; then + sed -e "/^#\(net\.inet6\.ip6\.accept_rtadv\)/s//\1/" \ + /mnt/etc/sysctl.conf >/tmp/sysctl.conf + cp /tmp/sysctl.conf /mnt/etc/sysctl.conf +fi + # Perform final steps common to both an install and an upgrade. finish_up diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 4122abda841..99589786813 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.638 2011/04/18 16:52:10 thib Exp $ +# $OpenBSD: install.sub,v 1.639 2011/07/04 20:59:05 halex Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1927,12 +1927,6 @@ finish_up() { done </mnt/etc/fstab fi - if grep -qs '^rtsol' /mnt/etc/hostname.*; then - sed -e "/^#\(net\.inet6\.ip6\.accept_rtadv\)/s//\1/" \ - /mnt/etc/sysctl.conf >/tmp/sysctl.conf - cp /tmp/sysctl.conf /mnt/etc/sysctl.conf - fi - # Create or update pkg.conf with the new package path, if any if [[ -n $package_path ]]; then grep -v '^[ ]*installpath[ ]*=' /mnt/etc/pkg.conf 2>&- > /tmp/pkgconf |