Date: Wed, 28 May 2014 20:23:29 GMT From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r268787 - soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts Message-ID: <201405282023.s4SKNT64055927@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405282023.s4SKNT64055927>