From owner-svn-soc-all@FreeBSD.ORG Mon Jul 14 20:30:49 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8DB0D03 for ; Mon, 14 Jul 2014 20:30:49 +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 7B83320B0 for ; Mon, 14 Jul 2014 20:30:49 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6EKUnNu090357 for ; Mon, 14 Jul 2014 20:30:49 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s6EKUmf8089972 for svn-soc-all@FreeBSD.org; Mon, 14 Jul 2014 20:30:48 GMT (envelope-from kczekirda@FreeBSD.org) Date: Mon, 14 Jul 2014 20:30:48 GMT Message-Id: <201407142030.s6EKUmf8089972@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: r270837 - 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, 14 Jul 2014 20:30:49 -0000 Author: kczekirda Date: Mon Jul 14 20:30:48 2014 New Revision: 270837 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=270837 Log: zfs pressed works 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 14 20:30:42 2014 (r270836) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/zfsboot Mon Jul 14 20:30:48 2014 (r270837) @@ -1395,7 +1395,7 @@ # Loop over the main menu until we've accomplished what we came here to do # while :; do - if ! f_interactive; then + if [ ! f_interactive ] || [ "$ZFSBOOT_PRESSED_CONFIRM" = "YES" ]; then retval=$DIALOG_OK mtag=">>> $msg_install" else @@ -1459,7 +1459,7 @@ # # Last Chance! # - if f_interactive; 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 14 20:30:42 2014 (r270836) +++ soc2014/kczekirda/pxe-fai-head/others/zfspressed Mon Jul 14 20:30:48 2014 (r270837) @@ -63,7 +63,7 @@ # # Default disks to use (always empty unless being scripted) # -ZFSBOOT_DISKS="" +ZFSBOOT_DISKS="ada1" # # Default partitioning scheme to use on disks @@ -124,6 +124,6 @@ # If interactive and the user has not explicitly chosen a vdev type or disks, # make the user confirm scripted/default choices when proceeding to install. # -ZFSBOOT_CONFIRM_LAYOUT=1 - +ZFSBOOT_CONFIRM_LAYOUT="" +ZFSBOOT_PRESSED_CONFIRM="YES"