svn commit: r259481 - head/usr.sbin/bsdinstall/scripts

[Devin Teske]

Author: dteske
Date: Mon Dec 16 19:54:55 2013
New Revision: 259481
URL: http://svnweb.freebsd.org/changeset/base/259481

Log:
  Auto-enable 4k sector alignment when disk encryption is requested (it is
  required in such a case). But don't prevent the user from pointing the
  gun at his/her foot -- you can disable 4k alignment after enabling geli).
  
  MFC after:	3 days

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Dec 16 19:51:11 2013	(r259480)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Dec 16 19:54:55 2013	(r259481)
@@ -1372,6 +1372,7 @@ while :; do
 		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
 			ZFSBOOT_GELI_ENCRYPTION=
 		else
+			ZFSBOOT_GNOP_4K_FORCE_ALIGN=1
 			ZFSBOOT_GELI_ENCRYPTION=1
 		fi
 		;;