From owner-svn-soc-all@FreeBSD.ORG Wed May 28 20:23:30 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6294F52C for ; Wed, 28 May 2014 20:23:30 +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 3471A221B for ; Wed, 28 May 2014 20:23:30 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SKNUqM056054 for ; Wed, 28 May 2014 20:23:30 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s4SKNT64055927 for svn-soc-all@FreeBSD.org; Wed, 28 May 2014 20:23:29 GMT (envelope-from kczekirda@FreeBSD.org) Date: Wed, 28 May 2014 20:23:29 GMT Message-Id: <201405282023.s4SKNT64055927@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: r268787 - 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: Wed, 28 May 2014 20:23:30 -0000 Author: kczekirda Date: Wed May 28 20:23:29 2014 New Revision: 268787 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268787 Log: mentor's comments 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 Wed May 28 19:59:27 2014 (r268786) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Wed May 28 20:23:29 2014 (r268787) @@ -41,9 +41,12 @@ # PARTITIONS # DISTRIBUTIONS # BSDINSTALL_DISTDIR -# MIRROR if not exist - ftp://ftp.freebsd.org -# RELDIR if not exist - releases -# RELEASE if not exist - 10.0-RELEASE +# MIRROR default: +: ${MIRROR:=ftp://ftp.freebsd.org} +# RELDIR default: +: ${RELDIR:=releases} +# RELEASE default: +: ${RELEASE:=10.0-RELEASE} # HOSTNAME to TMPETC if not exist, don't set # KEYMAP to TMPETC if not exist, don't set # DAEMONS to TMPETC if not exist, set only sshd @@ -100,28 +103,17 @@ fi # Build mirror path -if [ -z $MIRROR ]; then - MIRROR="ftp://ftp.freebsd.org" -fi - -if [ -z $RELDIR ]; then - RELDIR="releases" -fi - -if [ -z $RELEASE ]; then - RELEASE="10.0-RELEASE" -fi -BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/$RELDIR/`uname -m`/`uname -p`/$RELEASE" +BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/$RELDIR/$UNAME_M/$UNAME_P/$RELEASE" export BSDINSTALL_DISTSITE # Hostname -if [ -n $HOSTNAME ]; then +if [ -n "$HOSTNAME" ]; then echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname fi # Keymap -if [ -n $KEYMAP ]; then +if [ -n "$KEYMAP" ]; then echo "keymap=\"$KEYMAP\"" > $BSDINSTALL_TMPETC/rc.conf.keymap fi @@ -142,11 +134,11 @@ fi # Time zone -if [ -n $TIMEZONE ]; then +if [ -n "$TIMEZONE" ]; then if [ ! -f /tmp/bsdinstall-installscript-ab ]; then echo "#!/bin/sh" > /tmp/bsdinstall-installscript-ab fi - echo "echo \"$TIMEZONE\" > /var/db/zoneinfo; tzsetup -r" >> /tmp/bsdinstall-installscript-ab + echo "tzsetup \"$TIMEZONE\"" >> /tmp/bsdinstall-installscript-ab fi # Make partitions @@ -163,7 +155,8 @@ BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist" export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST" -mkdir -p $BSDINSTALL_FETCHDEST +echo "$BSDINSTALL_FETCHDEST" +mkdir -p "$BSDINSTALL_FETCHDEST" export FTP_PASSIVE_MODE=YES bsdinstall distfetch