From: krw <krw@openbsd.org>
Date: Sun, 4 May 2014 10:47:25 +0000 (+0000)
Subject: Make answering 'none' to the installer question "IPv6 address?" result
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=360604e4e927448481f3248427bf4b569e38f127;p=openbsd

Make answering 'none' to the installer question "IPv6 address?" result
in no IPv6 address, by appending '-inet6' to the generated hostname.<if>
file.

Less surprising to many people.

ok henning@ reyk@ beck@ rpe@
---

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 73f19ae8f4c..1535b642ba1 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.768 2014/04/25 19:34:24 halex Exp $
+#	$OpenBSD: install.sub,v 1.769 2014/05/04 10:47:25 krw Exp $
 #
 # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
 # All rights reserved.
@@ -944,7 +944,8 @@ v6_config() {
 	ask_until "$_prompt" "${_addr:-none}"
 
 	case $resp in
-	none)	return
+	none)	echo "-inet6" >>$_hn
+		return
 		;;
 	rtsol)	[[ ! -x /sbin/rtsol ]] && { echo "No /sbin/rtsol."; return; }
 		ifconfig $_ifs up