From owner-svn-soc-all@FreeBSD.ORG Mon Jul 28 19:13:20 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 5F0B71AF for ; Mon, 28 Jul 2014 19:13:20 +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 315D8260D for ; Mon, 28 Jul 2014 19:13:20 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6SJDKUn031899 for ; Mon, 28 Jul 2014 19:13:20 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s6SJDJ7W031896 for svn-soc-all@FreeBSD.org; Mon, 28 Jul 2014 19:13:19 GMT (envelope-from kczekirda@FreeBSD.org) Date: Mon, 28 Jul 2014 19:13:19 GMT Message-Id: <201407281913.s6SJDJ7W031896@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: r271486 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts others 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, 28 Jul 2014 19:13:20 -0000 Author: kczekirda Date: Mon Jul 28 19:13:19 2014 New Revision: 271486 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271486 Log: mentor's comments Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/zfsboot soc2014/kczekirda/pxe-fai-head/others/zfspressed Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/zfsboot ============================================================================== --- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/zfsboot Mon Jul 28 14:41:22 2014 (r271485) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/zfsboot Mon Jul 28 19:13:19 2014 (r271486) @@ -171,9 +171,7 @@ ############################################################ PRESSED -if [ -f "$1" ]; then - . "$1" - fi +[ -f "$1"] && . "$1" ############################################################ GLOBALS @@ -1395,7 +1393,7 @@ # Loop over the main menu until we've accomplished what we came here to do # while :; do - if [ ! f_interactive ] || [ "$ZFSBOOT_PRESSED_CONFIRM" = "YES" ]; then + if ! f_interactive || [ "$ZFSBOOT_PRESSED_CONFIRM" = "YES" ]; then retval=$DIALOG_OK mtag=">>> $msg_install" else @@ -1459,7 +1457,7 @@ # # Last Chance! # - if [ f_interactive] && [ ! $ZFSBOOT_PRESSED_CONFIRM ] ; then + if f_interactive && [ ! $ZFSBOOT_PRESSED_CONFIRM ] ; then dialog_last_chance $ZFSBOOT_DISKS || continue fi Modified: soc2014/kczekirda/pxe-fai-head/others/zfspressed ============================================================================== --- soc2014/kczekirda/pxe-fai-head/others/zfspressed Mon Jul 28 14:41:22 2014 (r271485) +++ soc2014/kczekirda/pxe-fai-head/others/zfspressed Mon Jul 28 19:13:19 2014 (r271486) @@ -6,7 +6,7 @@ # # Default options to use when creating zroot pool # -ZFSBOOT_POOL_CREATE_OPTIONS:="-O compress=lz4 -O atime=off" +ZFSBOOT_POOL_CREATE_OPTIONS="-O compress=lz4 -O atime=off" # # Default name for the boot environment parent dataset