From owner-svn-soc-all@FreeBSD.ORG Mon Aug 4 19:11:35 2014 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7520AC6 for ; Mon, 4 Aug 2014 19:11:35 +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 C7B092C9C for ; Mon, 4 Aug 2014 19:11:35 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s74JBZAg004345 for ; Mon, 4 Aug 2014 19:11:35 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s74JBYBF003866 for svn-soc-all@FreeBSD.org; Mon, 4 Aug 2014 19:11:34 GMT (envelope-from kczekirda@FreeBSD.org) Date: Mon, 4 Aug 2014 19:11:34 GMT Message-Id: <201408041911.s74JBYBF003866@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: r271863 - 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: Mon, 04 Aug 2014 19:11:36 -0000 Author: kczekirda Date: Mon Aug 4 19:11:34 2014 New Revision: 271863 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271863 Log: flow control when bsdinstall tofile simulation and quotes Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/services soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/time Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto Mon Aug 4 19:11:28 2014 (r271862) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/auto Mon Aug 4 19:11:34 2014 (r271863) @@ -74,7 +74,7 @@ for dist in $EXTRA_DISTS; do export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" done - [ -n $TOFILE ] && echo "DISTRIBUTIONS=\"$DISTRIBUTIONS\"" >> $TOFILE + [ -n "$TOFILE" ] && echo "DISTRIBUTIONS=\"$DISTRIBUTIONS\"" >> "$TOFILE" fi FETCH_DISTRIBUTIONS="" @@ -85,7 +85,7 @@ done FETCH_DISTRIBUTIONS=`echo $FETCH_DISTRIBUTIONS` # Trim white space -if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" -z $TOFILE ]; then +if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" -z "$TOFILE" ]; then dialog --backtitle "FreeBSD Installer" --title "Network Installation" --msgbox "No installation files were found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0 bsdinstall netconfig || error NETCONFIG_DONE=yes @@ -100,8 +100,10 @@ export BSDINSTALL_DISTSITE fi -rm -f $PATH_FSTAB -touch $PATH_FSTAB +if [ -z "$TOFILE" ]; then + rm -f $PATH_FSTAB + touch $PATH_FSTAB +fi PMODES="\ Guided \"Partitioning Tool (Recommended for Beginners)\" \ @@ -152,7 +154,7 @@ ;; esac -if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then +if [ ! -z "$FETCH_DISTRIBUTIONS" && -z "$TOFILE" ]; then ALL_DISTRIBUTIONS="$DISTRIBUTIONS" # Download to a directory in the new system as scratch space @@ -174,9 +176,11 @@ export DISTRIBUTIONS="$ALL_DISTRIBUTIONS" fi -bsdinstall checksum || error -bsdinstall distextract || error -bsdinstall rootpass || error +if [ -z "$TOFILE" ]; then + bsdinstall checksum || error + bsdinstall distextract || error + bsdinstall rootpass || error +fi trap true SIGINT # This section is optional if [ "$NETCONFIG_DONE" != yes ]; then @@ -240,14 +244,17 @@ finalconfig trap error SIGINT # SIGINT is bad again -bsdinstall config || error +if [ -z "$TOFILE" ]; then + bsdinstall config || error +fi -if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then +if [ ! -z "$BSDINSTALL_FETCHDEST" && -z "$TOFILE" ]; then [ "$BSDINSTALL_FETCHDEST" != "$BSDINSTALL_DISTDIR" ] && \ umount "$BSDINSTALL_DISTDIR" rm -rf "$BSDINSTALL_FETCHDEST" fi +if [ -z "$TOFILE" ]; then dialog --backtitle "FreeBSD Installer" --title "Manual Configuration" \ --yesno "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0 if [ $? -eq 0 ]; then @@ -260,6 +267,7 @@ bsdinstall entropy bsdinstall umount +fi f_dprintf "Installation Completed at %s" "$( date )" Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/services ============================================================================== --- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/services Mon Aug 4 19:11:28 2014 (r271862) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/services Mon Aug 4 19:11:34 2014 (r271863) @@ -54,7 +54,7 @@ havedump= -if [ -z $TOFILE ]; then +if [ -z "$TOFILE" ]; then for daemon in $DAEMONS; do [ "$daemon" = "dumpdev" ] && havedump=1 continue echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services @@ -63,7 +63,7 @@ for daemon in $DAEMONS; do DAEMONLIST="$DAEMONLIST $daemon" done - echo "DAEMONS=\"$DAEMONLIST\"" >> $TOFILE + echo "DAEMONS=\"$DAEMONLIST\"" >> "$TOFILE" fi echo '# Set dumpdev to "AUTO" to enable crash dumps, "NO"' \ Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/time ============================================================================== --- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/time Mon Aug 4 19:11:28 2014 (r271862) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/time Mon Aug 4 19:11:34 2014 (r271863) @@ -413,7 +413,7 @@ exit 1 ;; $DIALOG_OK) - echo "TIMEZONE=\"$TIMEZONE\"" >> $TOFILE + echo "TIMEZONE=\"$TIMEZONE\"" >> "$TOFILE" ;; esac fi