From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  1 20:08:31 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A5663566
 for <svn-soc-all@FreeBSD.org>; Sun,  1 Jun 2014 20:08:31 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 778162C44
 for <svn-soc-all@FreeBSD.org>; Sun,  1 Jun 2014 20:08:31 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51K8VCW095249
 for <svn-soc-all@FreeBSD.org>; Sun, 1 Jun 2014 20:08:31 GMT
 (envelope-from kczekirda@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s51K8VxK095234
 for svn-soc-all@FreeBSD.org; Sun, 1 Jun 2014 20:08:31 GMT
 (envelope-from kczekirda@FreeBSD.org)
Date: Sun, 1 Jun 2014 20:08:31 GMT
Message-Id: <201406012008.s51K8VxK095234@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 kczekirda@FreeBSD.org using -f
From: kczekirda@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r268933 -
 soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jun 2014 20:08:31 -0000

Author: kczekirda
Date: Sun Jun  1 20:08:30 2014
New Revision: 268933
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268933

Log:
  ipv6

Modified:
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Sun Jun  1 20:08:26 2014	(r268932)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Sun Jun  1 20:08:30 2014	(r268933)
@@ -67,8 +67,12 @@
 # TODO: network, users,
 # VARIABLES:
 # IPV6 (default: NO)
+: ${IPV6:=NO}
 # SLAAC (default: YES)
+: ${SLAAC:=YES}
 # ADDRESSV6
+# PREFIXV6
+: ${PREFIXV6:=64}
 # GWV6
 # DNS1V6
 # DNS2V6
@@ -174,13 +178,13 @@
 
 # Network
 
-if [ -n "$INTERFACE" ] && [ -n "$IPV4" ]; then
+if [ -n "$INTERFACE" ] && [ "$IPV4" = "YES" ]; then
         if [ "$DHCP" = "YES" ]; then
-                echo "ifconfig_$INTERFACE=\"DHCP\"" >> $BSDINSTALL_TMPETC/rc.conf.network
+                echo "ifconfig_${INTERFACE}=\"DHCP\"" >> $BSDINSTALL_TMPETC/rc.conf.network
         fi
 
         if [ "$DHCP" = "NO" ]; then
-                echo "ifconfig_$INTERFACE=\"inet $ADDRESSV4 netmask $NETMASK\"" >> $BSDINSTALL_TMPETC/rc.conf.network
+                echo "ifconfig_${INTERFACE}=\"inet $ADDRESSV4 netmask $NETMASK\"" >> $BSDINSTALL_TMPETC/rc.conf.network
                 echo "defaultrouter=\"$GWV4\"" >> $BSDINSTALL_TMPETC/rc.conf.network
 		mkdir $BSDINSTALL_CHROOT/etc/
                 echo "domain $DOMAIN" >> $BSDINSTALL_CHROOT/etc/resolv.conf
@@ -189,6 +193,25 @@
         fi
 fi
 
+if [ -n "$INTERFACE" ] && [ "$IPV6" = "YES" ]; then
+	echo "ipv6_enable=\"YES\"" >> $BSDINSTALL_TMPETC/rc.conf.network
+	if [ "$SLAAC" = "YES" ]; then
+		# TODO
+		echo "IPv6 SLAAC"
+	fi
+
+	if [ "$SLAAC" = "NO" ]; then
+                echo "ifconfig_${INTERFACE}_ipv6=\"ineti6 $ADDRESSV6 prefixlen $PREFIXV6\"" >> $BSDINSTALL_TMPETC/rc.conf.network
+                echo "ipv6_defaultrouter=\"$GWV6\"" >> $BSDINSTALL_TMPETC/rc.conf.network
+                if [ ! -d $BSDINSTALL_CHROOT/etc/ ]; then
+			mkdir $BSDINSTALL_CHROOT/etc/
+		fi
+                echo "domain $DOMAIN" >> $BSDINSTALL_CHROOT/etc/resolv.conf
+                echo "nameserver $DNS1V6" >> $BSDINSTALL_CHROOT/etc/resolv.conf
+                echo "nameserver $DNS2V6" >> $BSDINSTALL_CHROOT/etc/resolv.conf
+        fi
+fi
+
 # Fetch distributions
 
 BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist"