From owner-svn-soc-all@FreeBSD.ORG Sun Jun 1 20:08:22 2014 Return-Path: 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 F19AE539 for ; Sun, 1 Jun 2014 20:08:22 +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 C3CD62C42 for ; Sun, 1 Jun 2014 20:08:22 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51K8Mc2095100 for ; Sun, 1 Jun 2014 20:08:22 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s51K8Mje095098 for svn-soc-all@FreeBSD.org; Sun, 1 Jun 2014 20:08:22 GMT (envelope-from kczekirda@FreeBSD.org) Date: Sun, 1 Jun 2014 20:08:22 GMT Message-Id: <201406012008.s51K8Mje095098@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: r268931 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2014 20:08:23 -0000 Author: kczekirda Date: Sun Jun 1 20:08:21 2014 New Revision: 268931 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268931 Log: network configuration after mount BSDINSTALL_CHROOT directory 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:17 2014 (r268930) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Sun Jun 1 20:08:21 2014 (r268931) @@ -70,9 +70,6 @@ # SLAAC (default: YES) # ADDRESSV6 # GWV6 -# DOMAIN -# DNS1V4 -# DNS2V4 # DNS1V6 # DNS2V6 @@ -165,22 +162,6 @@ echo "tzsetup \"$TIMEZONE\"" >> /tmp/bsdinstall-installscript-ab fi -# Network - -if [ -n "$INTERFACE" ] && [ -n "$IPV4" ]; then - if [ "$DHCP" = "YES" ]; then - 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 "defaultrouter=\"$GWV4\"" >> $BSDINSTALL_TMPETC/rc.conf.network - echo "domain $DOMAIN" >> $BSDINSTALL_CHROOT/etc/resolv.conf - echo "nameserver $DNS1V4" >> $BSDINSTALL_CHROOT/etc/resolv.conf - echo "nameserver $DNS2V4" >> $BSDINSTALL_CHROOT/etc/resolv.conf - fi -fi - # Make partitions rm -f $PATH_FSTAB touch $PATH_FSTAB @@ -191,6 +172,24 @@ fi bsdinstall mount +# Network + +if [ -n "$INTERFACE" ] && [ -n "$IPV4" ]; then + if [ "$DHCP" = "YES" ]; then + 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 "defaultrouter=\"$GWV4\"" >> $BSDINSTALL_TMPETC/rc.conf.network + echo "domain $DOMAIN" >> $BSDINSTALL_CHROOT/etc/resolv.conf + echo "nameserver $DNS1V4" >> $BSDINSTALL_CHROOT/etc/resolv.conf + echo "nameserver $DNS2V4" >> $BSDINSTALL_CHROOT/etc/resolv.conf + fi +fi + + + # Fetch distributions BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist"