From owner-svn-soc-all@FreeBSD.ORG Thu Mar 5 09:43:05 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 4007FF0A for ; Thu, 5 Mar 2015 09:43:05 +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 21D90A21 for ; Thu, 5 Mar 2015 09:43:05 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t259h4ZZ013360 for ; Thu, 5 Mar 2015 09:43:04 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t259h4jV013357 for svn-soc-all@FreeBSD.org; Thu, 5 Mar 2015 09:43:04 GMT (envelope-from kczekirda@FreeBSD.org) Date: Thu, 5 Mar 2015 09:43:04 GMT Message-Id: <201503050943.t259h4jV013357@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: r278255 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts tools 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, 05 Mar 2015 09:43:05 -0000 Author: kczekirda Date: Thu Mar 5 09:43:02 2015 New Revision: 278255 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278255 Log: cleaning Deleted: soc2014/kczekirda/pxe-fai-head/tools/mfsBSD-ipxe.iso soc2014/kczekirda/pxe-fai-head/tools/mfsBSD-ipxe.usb soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-10.0-RELEASE-fai-amd64.img soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-10.0-RELEASE-fai-amd64.iso soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-11.0-CURRENT-fai-amd64.img soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-11.0-CURRENT-fai-amd64.iso 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 Feb 26 21:49:50 2015 (r278254) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Thu Mar 5 09:43:02 2015 (r278255) @@ -2,6 +2,7 @@ #- # Copyright (c) 2013 Nathan Whitehorn # Copyright (c) 2013 Devin Teske +# Copyright (c) 2014 Kamil Czekirda # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -47,10 +48,10 @@ # RELDIR default: : ${RELDIR:=releases} # RELEASE default: -: ${RELEASE:=10.0-RELEASE} +: ${RELEASE:=10.1-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 +# DAEMONS to TMPETC if not exist, don't set # TIMEZONE to /tmp/bsdinstall-installscript-ab # INTERFACE (em0, bge0) # IPV4 (default: YES) @@ -130,6 +131,20 @@ f_dprintf "Began Instalation at %s" "$( date )" fi +############################################################ DEVICE PREPARING + +# Make partitions +rm -f $PATH_FSTAB +touch $PATH_FSTAB +if [ "$ZFSBOOT" = "YES" ]; then + bsdinstall zfsboot /tmp/bsdinstall-installscript-aa +else + bsdinstall scriptedpart "$PARTITIONS" +fi +bsdinstall mount + +############################################################ INSTALLATION + # Build mirror path MIRROR=$(echo "$MIRROR" | sed 's/\/$//') @@ -137,6 +152,22 @@ BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/$RELDIR/$UNAME_M/$UNAME_P/$RELEASE" export BSDINSTALL_DISTSITE +# Fetch distributions + +BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist" +export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST" +echo "$BSDINSTALL_FETCHDEST" +mkdir -p "$BSDINSTALL_FETCHDEST" + +export FTP_PASSIVE_MODE=YES +bsdinstall distfetch + +# Unpack distributions +bsdinstall checksum +bsdinstall distextract + +############################################################ CONFIGURATION + # Hostname if [ -n "$HOSTNAME" ]; then echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname @@ -148,19 +179,15 @@ fi # Services -if [ -n "$DAEMONS" ]; then - havedump= - for daemon in $DAEMONS; do - [ "$daemon" = "dumpdev" ] && havedump=1 continue - echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services - done - if [ "$havedump" ]; then - echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services - else - echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services - fi +havedump= +for daemon in $DAEMONS; do + [ "$daemon" = "dumpdev" ] && havedump=1 continue + echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services +done +if [ "$havedump" ]; then + echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services else - echo "sshd_enable=\"YES\"" > $BSDINSTALL_TMPETC/rc.conf.services + echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services fi # Time zone @@ -195,18 +222,7 @@ echo "adduser -f $USERSCONFIG" >> /tmp/bsdinstall-installscript-ab fi -# Make partitions -rm -f $PATH_FSTAB -touch $PATH_FSTAB -if [ "$ZFSBOOT" = "YES" ]; then - bsdinstall zfsboot /tmp/bsdinstall-installscript-aa -else - bsdinstall scriptedpart "$PARTITIONS" -fi -bsdinstall mount - # Network - if [ -n "$INTERFACE" ] && [ "$IPV4" = "YES" ]; then if [ "$DHCP" = "YES" ]; then echo "ifconfig_${INTERFACE}=\"DHCP\"" >> $BSDINSTALL_TMPETC/rc.conf.network @@ -230,8 +246,7 @@ fi fi -# resolver - +# Resolver mkdir $BSDINSTALL_CHROOT/etc/ if [ "$DOMAIN" ]; then echo "domain $DOMAIN" >> $BSDINSTALL_CHROOT/etc/resolv.conf @@ -253,29 +268,9 @@ echo "nameserver $DNS4" >> $BSDINSTALL_CHROOT/etc/resolv.conf fi - -# Fetch distributions - -BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist" -export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST" -echo "$BSDINSTALL_FETCHDEST" -mkdir -p "$BSDINSTALL_FETCHDEST" - -export FTP_PASSIVE_MODE=YES -bsdinstall distfetch - -# Unpack distributions -bsdinstall checksum -bsdinstall distextract - # Finalize install 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 - # Run post-install script if [ -f /tmp/bsdinstall-installscript-ab ]; then cp /tmp/bsdinstall-installscript-ab $BSDINSTALL_CHROOT/tmp/installscript From owner-svn-soc-all@FreeBSD.ORG Thu Mar 5 09:46:01 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D00CF48 for ; Thu, 5 Mar 2015 09:46:01 +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 8974DA38 for ; Thu, 5 Mar 2015 09:46:01 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t259k1Yf014832 for ; Thu, 5 Mar 2015 09:46:01 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t259k0Mm014816 for svn-soc-all@FreeBSD.org; Thu, 5 Mar 2015 09:46:00 GMT (envelope-from kczekirda@FreeBSD.org) Date: Thu, 5 Mar 2015 09:46:00 GMT Message-Id: <201503050946.t259k0Mm014816@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: r278256 - soc2014/kczekirda/pxe-fai-head/tools 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, 05 Mar 2015 09:46:01 -0000 Author: kczekirda Date: Thu Mar 5 09:45:59 2015 New Revision: 278256 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278256 Log: add mfsbsd-10.1 fai Added: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-10.1-RELEASE-fai-amd64.iso Added: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-10.1-RELEASE-fai-amd64.iso ============================================================================== Files /dev/null 00:00:00 1970 (empty, because file is newly added) and soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-10.1-RELEASE-fai-amd64.iso Thu Mar 5 09:45:59 2015 (r278256) differ