Date: Sun, 1 Jun 2014 20:08:31 GMT From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r268933 - soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts Message-ID: <201406012008.s51K8VxK095234@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406012008.s51K8VxK095234>