socsvn commit: r272605 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts others

[kczekirda at FreeBSD.org]

Author: kczekirda
Date: Mon Aug 18 11:50:14 2014
New Revision: 272605
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272605

Log:
  ipv6 to file fixed

Modified:
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig_ipv6
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script
  soc2014/kczekirda/pxe-fai-head/others/template.input

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig_ipv6
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig_ipv6	Mon Aug 18 10:55:04 2014	(r272604)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig_ipv6	Mon Aug 18 11:50:14 2014	(r272605)
@@ -165,7 +165,7 @@
 			next;
 		}
 		if (dfr == 1) {
-			printf("ipv6_defaultrouter=\"%s\"\n", $1);
+			printf("GWV6=\"%s\"\n", $1);
 			next;
 		}
 		if (count > 0) {
@@ -176,7 +176,7 @@
 		if (!match($1, "/")) {
 			sub("$", "/64", $1);
 		}
-		printf("ifconfig_%s_ipv6=\"inet6 %s\"\n", iface, $1);
+		printf("ADDRESSV6=\"%s\"\n", $1);
 	}' >> "$TOFILE"
 fi
 

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Mon Aug 18 10:55:04 2014	(r272604)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Mon Aug 18 11:50:14 2014	(r272605)
@@ -223,7 +223,7 @@
 	fi
 
 	if [ "$SLAAC" = "NO" ]; then
-		echo "ifconfig_${INTERFACE}_ipv6=\"ineti6 $ADDRESSV6 prefixlen $PREFIXV6\"" >> $BSDINSTALL_TMPETC/rc.conf.network
+		echo "ifconfig_${INTERFACE}_ipv6=\"ineti6 $ADDRESSV6\"" >> $BSDINSTALL_TMPETC/rc.conf.network
 		echo "ipv6_defaultrouter=\"$GWV6\"" >> $BSDINSTALL_TMPETC/rc.conf.network
 	fi
 fi

Modified: soc2014/kczekirda/pxe-fai-head/others/template.input
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/others/template.input	Mon Aug 18 10:55:04 2014	(r272604)
+++ soc2014/kczekirda/pxe-fai-head/others/template.input	Mon Aug 18 11:50:14 2014	(r272605)
@@ -22,12 +22,11 @@
 #DNS2="8.8.8.8"
 #DNS3="2001:4860:4860::8888"
 #DNS4="2001:4860:4860::8844"
+#ADDRESSV6="2001:db8:4672:6565:2026:5043:2d42:5344"
+#GWV6="2001:db8:4672:6565::1"
 
 ####################### Needed manual configuration
 
-#ADDRESSV6="2001:db8:4672:6565:2026:5043:2d42:5344"
-#PREFIXV6="64"
-#GWV6="2001:db8:4672:6565::1"
 ROOTPWHASH='$6$Qb2inVrU65.r4Dx5$DaHdU2P1ipFMLZ8J5xJk8DDtC88rE87qo7du6CBvNgyit8RezQ2qkPe83X4KgTCTEtXGrMaMKZ1.W4xg1yz0z/'
 #ROOTPWPLAIN="password"
 #USERS="/etc/usersconfig"