socsvn commit: r271486 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts others
kczekirda at FreeBSD.org
kczekirda at FreeBSD.org
Mon Jul 28 19:13:20 UTC 2014
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
More information about the svn-soc-all
mailing list