Date: Thu, 12 Mar 2015 13:39:26 GMT From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r278257 - soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts Message-ID: <201503121339.t2CDdQgQ025799@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kczekirda Date: Thu Mar 12 13:39:23 2015 New Revision: 278257 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278257 Log: simple choice of release 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 5 09:45:59 2015 (r278256) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Thu Mar 12 13:39:23 2015 (r278257) @@ -45,10 +45,8 @@ # BSDINSTALL_DISTDIR # MIRROR default: : ${MIRROR:=ftp://ftp.freebsd.org} -# RELDIR default: -: ${RELDIR:=releases} # RELEASE default: -: ${RELEASE:=10.1-RELEASE} +: ${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 @@ -141,15 +139,25 @@ else bsdinstall scriptedpart "$PARTITIONS" fi + bsdinstall mount ############################################################ INSTALLATION # Build mirror path +if [ "$RELEASE" = "11.0" ]; then + RELDIR="snapshots" + RELEASE="$RELEASE-CURRENT" +else + RELDIR="releases" + RELEASE="$RELEASE-RELEASE" +fi + MIRROR=$(echo "$MIRROR" | sed 's/\/$//') BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/$RELDIR/$UNAME_M/$UNAME_P/$RELEASE" + export BSDINSTALL_DISTSITE # Fetch distributions @@ -230,7 +238,7 @@ if [ "$DHCP" = "NO" ]; then echo "ifconfig_${INTERFACE}=\"inet $ADDRESSV4 netmask $NETMASK\"" >> $BSDINSTALL_TMPETC/rc.conf.network - echo "defaultrouter=\"$GWV4\"" >> $BSDINSTALL_TMPETC/rc.conf.networ + echo "defaultrouter=\"$GWV4\"" >> $BSDINSTALL_TMPETC/rc.conf.network fi fi @@ -247,7 +255,7 @@ fi # Resolver -mkdir $BSDINSTALL_CHROOT/etc/ + if [ "$DOMAIN" ]; then echo "domain $DOMAIN" >> $BSDINSTALL_CHROOT/etc/resolv.conf fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503121339.t2CDdQgQ025799>