Date: Mon, 4 Aug 2014 19:11:46 GMT From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271865 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts others Message-ID: <201408041911.s74JBkUk007901@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kczekirda Date: Mon Aug 4 19:11:46 2014 New Revision: 271865 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271865 Log: ipv6 first steps Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig_ipv6 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 4 19:11:40 2014 (r271864) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/netconfig_ipv6 Mon Aug 4 19:11:46 2014 (r271865) @@ -53,6 +53,8 @@ ;; esac +[ -z "$TOFILE" ] && echo IPV6=\"YES\" >> "$TOFILE" + AGAIN="" while : ; do MSG="Would you like to try stateless address autoconfiguration (SLAAC)${AGAIN}?" @@ -71,9 +73,14 @@ continue fi fi - echo ifconfig_${INTERFACE}_ipv6=\"inet6 accept_rtadv\" >> $BSDINSTALL_TMPETC/._rc.conf.net + if [ -z "$TOFILE" ]; then + echo ifconfig_${INTERFACE}_ipv6=\"inet6 accept_rtadv\" >> $BSDINSTALL_TMPETC/._rc.conf.net + else + echo SLAAC=\"YES\" >> "$TOFILE" + fi exit 0 else + echo SLAAC=\"NO\" >> "$TOFILE" break fi done @@ -113,34 +120,39 @@ if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi exec 3>&- -echo ${IF_CONFIG} | tr ' ' '\n' | \ -awk -v iface="${INTERFACE}" ' -BEGIN { - dfr=0; - count=0; -} -{ - if (/^[[:space:]]+$/) { - next; - } - if (/DefaultRouter/) { - dfr=1; - next; - } - if (dfr == 1) { - printf("ipv6_defaultrouter=\"%s\"\n", $1); - next; - } - if (count > 0) { - # Ignore all but the first IP address for now. - next; - } - count++; - if (!match($1, "/")) { - sub("$", "/64", $1); - } - printf("ifconfig_%s_ipv6=\"inet6 %s\"\n", iface, $1); -}' >> $BSDINSTALL_TMPETC/._rc.conf.net +if [ -z "$TOFILE" ]; then + echo ${IF_CONFIG} | tr ' ' '\n' | \ + awk -v iface="${INTERFACE}" ' + BEGIN { + dfr=0; + count=0; + } + { + if (/^[[:space:]]+$/) { + next; + } + if (/DefaultRouter/) { + dfr=1; + next; + } + if (dfr == 1) { + printf("ipv6_defaultrouter=\"%s\"\n", $1); + next; + } + if (count > 0) { + # Ignore all but the first IP address for now. + next; + } + count++; + if (!match($1, "/")) { + sub("$", "/64", $1); + } + printf("ifconfig_%s_ipv6=\"inet6 %s\"\n", iface, $1); + }' >> $BSDINSTALL_TMPETC/._rc.conf.net +else + echo $IF_CONFIG + echo "static ip6" >> "$TOFILE" +fi if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then . $BSDINSTALL_TMPETC/._rc.conf.net Modified: soc2014/kczekirda/pxe-fai-head/others/template.input ============================================================================== --- soc2014/kczekirda/pxe-fai-head/others/template.input Mon Aug 4 19:11:40 2014 (r271864) +++ soc2014/kczekirda/pxe-fai-head/others/template.input Mon Aug 4 19:11:46 2014 (r271865) @@ -12,16 +12,16 @@ ADDRESSV4="192.168.1.254" NETMASK="255.255.255.0" GWV4="192.168.1.1" +IPV6="NO" +SLAAC="YES" +#ADDRESSV6="2001:db8:4672:6565:2026:5043:2d42:5344" +#PREFIXV6="64" +#GWV6="2001:db8:4672:6565::1" #DOMAIN="example.com" #DNS1V4="194.204.159.1" #DNS2V4="8.8.8.8" -#IPV6="NO" -#SLAAC="YES" -#ADDRESSV6="2001:db8:4672:6565:2026:5043:2d42:5344" -#PREFIXV6="64" -#GWV6="2001:db8:4672:6565::1" #DNS1V6="2001:4860:4860::8888" #DNS2V6="2001:4860:4860::8844"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408041911.s74JBkUk007901>