From owner-svn-soc-all@FreeBSD.ORG Thu Mar 12 13:39:49 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB28F1D9 for ; Thu, 12 Mar 2015 13:39:49 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C794A44 for ; Thu, 12 Mar 2015 13:39:49 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2CDdnYd025948 for ; Thu, 12 Mar 2015 13:39:49 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t2CDdm0a025931 for svn-soc-all@FreeBSD.org; Thu, 12 Mar 2015 13:39:48 GMT (envelope-from kczekirda@FreeBSD.org) Date: Thu, 12 Mar 2015 13:39:48 GMT Message-Id: <201503121339.t2CDdm0a025931@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: r278259 - 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-1 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: Thu, 12 Mar 2015 13:39:49 -0000 Author: kczekirda Date: Thu Mar 12 13:39:48 2015 New Revision: 278259 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278259 Log: TMPETC unnecessary and ipv6 fixes 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 Thu Mar 12 13:39:39 2015 (r278258) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Thu Mar 12 13:39:48 2015 (r278259) @@ -47,10 +47,10 @@ : ${MIRROR:=ftp://ftp.freebsd.org} # RELEASE default: : ${RELEASE:=10.1} -# HOSTNAME to TMPETC if not exist, don't set -# KEYMAP to TMPETC if not exist, don't set -# DAEMONS to TMPETC if not exist, don't set -# TIMEZONE to /tmp/bsdinstall-installscript-ab +# HOSTNAME if not exist, don't set +# KEYMAP if not exist, don't set +# DAEMONS if not exist, don't set +# TIMEZONE # INTERFACE (em0, bge0) # IPV4 (default: YES) : ${IPV4:=YES} @@ -108,8 +108,6 @@ shift f_dprintf "Began Installation at %s" "$( date )" -rm -rf $BSDINSTALL_TMPETC -mkdir $BSDINSTALL_TMPETC split -a 2 -p '^#!.*' "$SCRIPT" /tmp/bsdinstall-installscript- @@ -261,12 +259,12 @@ fi echo "echo ipv6_enable=\\\"YES\\\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab if [ "$SLAAC" = "YES" ]; then - echo "echo \"ifconfig_${INTERFACE}_ipv6=\\\"inet6 accept_rtadv\"\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab + echo "echo ifconfig_${INTERFACE}_ipv6=\\\"inet6 accept_rtadv\\\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab fi if [ "$SLAAC" = "NO" ]; then - echo "echo ifconfig_${INTERFACE}_ipv6=\"ineti6 $ADDRESSV6\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab - echo "echo ipv6_defaultrouter=\"$GWV6\" >> $BSDINSTALL_TMPETC/rc.conf" >> /tmp/bsdinstall-installscript-ab + echo "echo \"ifconfig_${INTERFACE}_ipv6=\\\"ineti6 $ADDRESSV6\\\"\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab + echo "echo ipv6_defaultrouter=\\\"$GWV6\\\" >> /etc/rc.conf" >> /tmp/bsdinstall-installscript-ab fi fi @@ -293,11 +291,6 @@ fi # Finalize install -cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf -rm $BSDINSTALL_TMPETC/rc.conf.* - -cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc - cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf rm $BSDINSTALL_TMPBOOT/loader.conf.* df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf