summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2018-02-10 05:59:07 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2018-02-10 05:59:07 +0000
commitfb5d610df4cdbcfb21380f737eb84f8e91fe2cc9 (patch)
tree1dac8a06cd9ece884b12cb92970331801630afd6 /distrib/miniroot
parent040fcac5496fcb05243ae57288d3169ddfb1dbc1 (diff)
installer bits for RFC 7217 support
OK rpe, tb, naddy, sthen
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sub5
1 files changed, 4 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index cfbdc13ebfd..4110cb45a24 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sub,v 1.1058 2018/02/06 22:14:52 sthen Exp $
+# $OpenBSD: install.sub,v 1.1059 2018/02/10 05:59:06 florian Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -3112,6 +3112,9 @@ do_upgrade() {
THESETS="$THESETS site$VERSION-$(hostname -s).tgz"
export PS1='\h# '
+ _f=/mnt/etc/soii.key
+ [[ ! -f $_f ]] || sysctl net.inet6.ip6.soiikey=$(<$_f)
+
# Configure the network.
enable_network