Date: Mon, 14 Jul 2014 20:30:48 GMT 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 Message-ID: <201407142030.s6EKUmf8089972@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407142030.s6EKUmf8089972>