From owner-svn-soc-all@FreeBSD.ORG Sun Jun 1 20:08:05 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 B79EB4F4 for ; Sun, 1 Jun 2014 20:08:05 +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 8A2EC2C3D for ; Sun, 1 Jun 2014 20:08:05 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51K85MK094954 for ; Sun, 1 Jun 2014 20:08:05 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s51K85n7094938 for svn-soc-all@FreeBSD.org; Sun, 1 Jun 2014 20:08:05 GMT (envelope-from kczekirda@FreeBSD.org) Date: Sun, 1 Jun 2014 20:08:05 GMT Message-Id: <201406012008.s51K85n7094938@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: r268927 - 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:05 -0000 Author: kczekirda Date: Sun Jun 1 20:08:04 2014 New Revision: 268927 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268927 Log: dhcp 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:07:59 2014 (r268926) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Sun Jun 1 20:08:04 2014 (r268927) @@ -38,6 +38,7 @@ ############################################################ CONFIGURATION # VARIABLES: + # PARTITIONS # DISTRIBUTIONS # BSDINSTALL_DISTDIR @@ -51,15 +52,20 @@ # KEYMAP to TMPETC if not exist, don't set # DAEMONS to TMPETC if not exist, set only sshd # TIMEZONE to /tmp/bsdinstall-installscript-ab - -# TODO: network, users, -# VARIABLES: -# INTERFACE (em0, bge0) -# IPV4 (default: YES) -# DHCP (default: YES) +# INTERFACE (em0, bge0) +# IPV4 (default: YES) +: ${IPV4:=YES} +# DHCP (default: YES) +: ${DHCP:=YES} # ADDRESSV4 # NETMASK # GWV4 +# DOMAIN +# DNS1V4 +# DNS2V4 + +# TODO: network, users, +# VARIABLES: # IPV6 (default: NO) # SLAAC (default: YES) # ADDRESSV6 @@ -161,6 +167,18 @@ # Network +if [ -n "$INTERFACE" ] && [ -n "$IPV4" ]; then + if [ "$DHCP" = "YES" ]; then + echo "ifconfig_$INTERFACE=\"DHCP\"" >> $BSDINSTALL_TMPETC/rc.conf.network + fi +fi + +# ADDRESSV4 +# NETMASK +# GWV4 +# DOMAIN +# DNS1V4 +# DNS2V4 # Make partitions rm -f $PATH_FSTAB @@ -190,9 +208,9 @@ bsdinstall config # Make sure networking is functional, if we can arrange that -if [ ! -f $BSDINSTALL_CHROOT/etc/resolv.conf -a -f /etc/resolv.conf ]; then - cp /etc/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf -fi +#if [ ! -f $BSDINSTALL_CHROOT/etc/resolv.conf -a -f /etc/resolv.conf ]; then +# cp /etc/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf +#fi # Run post-install script if [ -f /tmp/bsdinstall-installscript-ab ]; then