MFH

Sponsored by:	The FreeBSD Foundation

8 files changed, 267 insertions, 247 deletions

diff --git a/usr.sbin/bsdconfig/bsdconfig b/usr.sbin/bsdconfig/bsdconfig
index 993865c..2ecdb30 100755
--- a/usr.sbin/bsdconfig/bsdconfig
+++ b/usr.sbin/bsdconfig/bsdconfig
@@ -212,7 +212,7 @@ dialog_menu_main()
 		 *) menu_program="$menuitem/$menu_program"
 		esac
 
-		tag=$( f_substr "$DIALOG_MENU_TAGS" $index 1 )
+		f_substr -v tag "$DIALOG_MENU_TAGS" $index 1
 		setvar "menu_program$tag" "$menu_program"
 
 		f_shell_escape "$menu_title" menu_title
@@ -256,7 +256,7 @@ dialog_menu_main()
 		 *) menu_program="$BSDCFG_LOCAL_LIBE/$menuitem/$menu_program"
 		esac
 
-		tag=$( f_substr "$DIALOG_MENU_TAGS" $index 1 )
+		f_substr -v tag "$DIALOG_MENU_TAGS" $index 1
 		setvar "menu_program$tag" "$menu_program"
 
 		f_shell_escape "$menu_title" menu_title
diff --git a/usr.sbin/bsdconfig/networking/share/media.subr b/usr.sbin/bsdconfig/networking/share/media.subr
index 1cb77f8..028944b 100644
--- a/usr.sbin/bsdconfig/networking/share/media.subr
+++ b/usr.sbin/bsdconfig/networking/share/media.subr
@@ -180,18 +180,18 @@ f_dialog_menu_media_options()
 		f_ifconfig_media $interface | \
 		( index=1
 
-		  echo "'$( f_substr "$DIALOG_MENU_TAGS" $index 1 )'"
-		  echo "'$opt_none'" 
+		  f_substr -v tagn "$DIALOG_MENU_TAGS" $index 1
+		  echo "'$tagn' '$opt_none'"
 		  index=$(( $index + 1 ))
 
-		  echo "'$( f_substr "$DIALOG_MENU_TAGS" $index 1 )'"
-		  echo "'$opt_cust'" 
+		  f_substr -v tagn "$DIALOG_MENU_TAGS" $index 1
+		  echo "'$tagn' '$opt_cust'"
 		  index=$(( $index + 1 ))
 
 		  while read media_options; do
 		  	[ $index -lt ${#DIALOG_MENU_TAGS} ] || break
-		  	echo "'$( f_substr "$DIALOG_MENU_TAGS" $index 1 )'"
-		  	echo "'$media_options'"
+		  	f_substr -v tagn "$DIALOG_MENU_TAGS" $index 1
+		  	echo "'$tagn' '$media_options'"
 		  	index=$(( $index + 1 ))
 		  done
 		)
diff --git a/usr.sbin/bsdconfig/networking/share/resolv.subr b/usr.sbin/bsdconfig/networking/share/resolv.subr
index fc42e12..779863c 100644
--- a/usr.sbin/bsdconfig/networking/share/resolv.subr
+++ b/usr.sbin/bsdconfig/networking/share/resolv.subr
@@ -441,7 +441,7 @@ f_dialog_menu_nameservers()
 
 			for ns in $nameservers; do
 				[ $index -lt ${#DIALOG_MENU_TAGS} ] || break
-				tag=$( f_substr "$DIALOG_MENU_TAGS" $index 1 )
+				f_substr -v tag "$DIALOG_MENU_TAGS" $index 1
 				echo "'$tag nameserver' '$ns'"
 				index=$(( $index + 1 ))
 			done
diff --git a/usr.sbin/bsdconfig/share/device.subr b/usr.sbin/bsdconfig/share/device.subr
index d95684d..97c3ecd 100644
--- a/usr.sbin/bsdconfig/share/device.subr
+++ b/usr.sbin/bsdconfig/share/device.subr
@@ -1,6 +1,6 @@
 if [ ! "$_DEVICE_SUBR" ]; then _DEVICE_SUBR=1
 #
-# Copyright (c) 2012-2014 Devin Teske
+# Copyright (c) 2012-2016 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1032,7 +1032,7 @@ f_device_is_active()
 #
 f_device_find()
 {
-	local OPTIND OPTARG flag only_one=
+	local OPTIND=1 OPTARG flag only_one=
 	while getopts 1 flag; do
 		case "$flag" in
 		1) only_one=1 ;;
diff --git a/usr.sbin/bsdconfig/share/strings.subr b/usr.sbin/bsdconfig/share/strings.subr
index e0cd7e0..1a4fe6e 100644
--- a/usr.sbin/bsdconfig/share/strings.subr
+++ b/usr.sbin/bsdconfig/share/strings.subr
@@ -1,6 +1,6 @@
 if [ ! "$_STRINGS_SUBR" ]; then _STRINGS_SUBR=1
 #
-# Copyright (c) 2006-2013 Devin Teske
+# Copyright (c) 2006-2016 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -52,44 +52,63 @@ VALID_VARNAME_CHARS="0-9ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_"
 
 ############################################################ FUNCTIONS
 
-# f_substr "$string" $start [$length]
+# f_isinteger $arg
 #
-# Simple wrapper to awk(1)'s `substr' function.
+# Returns true if argument is a positive/negative whole integer.
 #
-f_substr()
+f_isinteger()
 {
-	local string="$1" start="${2:-0}" len="${3:-0}"
-	echo "$string" | awk "{ print substr(\$0, $start, $len) }"
+	local arg="${1#-}"
+	[ "${arg:-x}" = "${arg%[!0-9]*}" ]
 }
 
-# f_snprintf $var_to_set $size $format [$arguments ...]
+# f_substr [-v $var_to_set] $string $start [$length]
 #
-# Similar to snprintf(3), write at most $size number of bytes into $var_to_set
-# using printf(1) syntax (`$format [$arguments ...]'). The value of $var_to_set
-# is NULL unless at-least one byte is stored from the output.
+# Similar to awk(1)'s substr(), return length substring of string that begins
+# at start position counted from 1. 
 #
-f_snprintf()
+f_substr()
 {
-	local __funcname=f_snprintf
-	local __var_to_set="$1" __size="$2"
-	shift 2 # var_to_set size
+	local OPTIND=1 OPTARG __flag __var_to_set=
+	while getopts v: __flag; do
+		case "$__flag" in
+		v) __var_to_set="$OPTARG" ;;
+		esac
+	done
+	shift $(( $OPTIND - 1 ))
+	
+	local __tmp="$1" __start="${2:-1}" __size="$3"
+	local __tbuf __tbuf_len __trim __trimq
 
-	if [ "$__size" -eq 0 ] 2> /dev/null; then
-		setvar "$__var_to_set" ""
+	if [ ! "$__tmp" ]; then
+		[ "$__var_to_set" ] && setvar "$__var_to_set" ""
 		return ${SUCCESS:-0}
-	elif [ $? -ge 2 ] || [ $__size -lt 0 ]; then
-		setvar "$__var_to_set" ""
-		echo "$__funcname: invalid size argument \`__size'" >&2
+	fi
+	[ "$__start" -ge 1 ] 2> /dev/null || __start=1
+	if ! [ "${__size:-1}" -ge 1 ] 2> /dev/null; then
+		[ "$__var_to_set" ] && setvar "$__var_to_set" ""
 		return ${FAILURE:-1}
 	fi
 
-	local __f_snprintf_tmp
-	f_sprintf __f_snprintf_tmp "$@"
+	__trim=$(( $__start - 1 ))
+	while [ $__trim -gt 0 ]; do
+		__tbuf="?"
+		__tbuf_len=1
+		while [ $__tbuf_len -lt $(( $__trim / $__tbuf_len )) ]; do
+			__tbuf="$__tbuf?"
+			__tbuf_len=$(( $__tbuf_len + 1 ))
+		done
+		__trimq=$(( $__trim / $__tbuf_len ))
+		__trim=$(( $__trim - $__tbuf_len * $__trimq ))
+		while [ $__trimq -gt 0 ]; do
+			__tmp="${__tmp#$__tbuf}"
+			__trimq=$(( $__trimq - 1 ))
+		done
+	done
 
-	local __tmp_size=${#__f_snprintf_tmp}
-	local __trim=$(( $__tmp_size - $__size )) __trimq
-	local __tbuf __tbuf_len
+	local __tmp_size=${#__tmp}
 	local __mask __mask_len
+	__trim=$(( $__tmp_size - ${__size:-$__tmp_size} ))
 	while [ $__trim -gt 0 ]; do
 		__tbuf="?"
 		__tbuf_len=1
@@ -102,11 +121,11 @@ f_snprintf()
 			__trimq=$(( $__trim / $__tbuf_len ))
 			__trim=$(( $__trim - $__tbuf_len * $__trimq ))
 			while [ $__trimq -gt 0 ]; do
-				__f_snprintf_tmp="${__f_snprintf_tmp%$__tbuf}"
+				__tmp="${__tmp%$__tbuf}"
 				__trimq=$(( $__trimq - 1 ))
 			done
 		else
-			__mask="$__f_snprintf_tmp"
+			__mask="$__tmp"
 			while [ $__tbuf_len -lt $(( $__size / $__tbuf_len )) ]
 			do
 				__tbuf="$__tbuf?"
@@ -123,10 +142,11 @@ f_snprintf()
 				__mask="${__mask#$__tbuf}"
 				__trimq=$(( $__trimq - 1 ))
 			done
-			__f_snprintf_tmp="${__f_snprintf_tmp%"$__mask"}"
+			__tmp="${__tmp%"$__mask"}"
 		fi
 	done
-	setvar "$__var_to_set" "$__f_snprintf_tmp"
+
+	setvar "$__var_to_set" "$__tmp"
 }
 
 # f_sprintf $var_to_set $format [$arguments ...]
@@ -138,7 +158,40 @@ f_sprintf()
 {
 	local __var_to_set="$1"
 	shift 1 # var_to_set
-	eval "$__var_to_set"=\$\( printf -- \"\$@\" \)
+
+	case "$BASH_VERSION" in
+	3.1*|4.*)
+		local __tmp
+		printf -v __tmp "$@"
+		eval "$__var_to_set"=\"\${__tmp%\$NL}\"
+		;;
+	*) eval "$__var_to_set"=\$\( printf -- \"\$@\" \)
+	esac
+}
+
+# f_vsprintf $var_to_set $format $format_args
+#
+# Similar to vsprintf(3), write a string into $var_to_set using printf(1)
+# syntax (`$format $format_args').
+#
+f_vsprintf()
+{
+	eval f_sprintf \"\$1\" \"\$2\" $3
+}
+
+# f_snprintf $var_to_set $size $format [$arguments ...]
+#
+# Similar to snprintf(3), write at most $size number of bytes into $var_to_set
+# using printf(1) syntax (`$format [$arguments ...]').
+#
+f_snprintf()
+{
+	local __var_to_set="$1" __size="$2"
+	shift 2 # var_to_set size
+
+	local __f_snprintf_tmp
+	f_sprintf __f_snprintf_tmp "$@"
+	f_substr "$__var_to_set" "$__f_snprintf_tmp" 1 "$__size"
 }
 
 # f_vsnprintf $var_to_set $size $format $format_args
@@ -176,140 +229,6 @@ f_vsnprintf()
 	eval f_snprintf \"\$1\" \"\$2\" \"\$3\" $4
 }
 
-# f_vsprintf $var_to_set $format $format_args
-#
-# Similar to vsprintf(3), write a string into $var_to_set using printf(1)
-# syntax (`$format $format_args').
-#
-f_vsprintf()
-{
-	eval f_sprintf \"\$1\" \"\$2\" $3
-}
-
-# f_longest_line_length
-#
-# Simple wrapper to an awk(1) script to print the length of the longest line of
-# input (read from stdin). Supports the newline escape-sequence `\n' for
-# splitting a single line into multiple lines.
-#
-f_longest_line_length_awk='
-BEGIN { longest = 0 }
-{
-	if (split($0, lines, /\\n/) > 1)
-	{
-		for (n in lines)
-		{
-			len = length(lines[n])
-			longest = ( len > longest ? len : longest )
-		}
-	}
-	else
-	{
-		len = length($0)
-		longest = ( len > longest ? len : longest )
-	}
-}
-END { print longest }
-'
-f_longest_line_length()
-{
-	awk "$f_longest_line_length_awk"
-}
-
-# f_number_of_lines
-#
-# Simple wrapper to an awk(1) script to print the number of lines read from
-# stdin. Supports newline escape-sequence `\n' for splitting a single line into
-# multiple lines.
-#
-f_number_of_lines_awk='
-BEGIN { num_lines = 0 }
-{
-	num_lines += split(" "$0, unused, /\\n/)
-}
-END { print num_lines }
-'
-f_number_of_lines()
-{
-	awk "$f_number_of_lines_awk"
-}
-
-# f_isinteger $arg
-#
-# Returns true if argument is a positive/negative whole integer.
-#
-f_isinteger()
-{
-	local arg="${1#-}"
-	[ "${arg:-x}" = "${arg%[!0-9]*}" ]
-}
-
-# f_uriencode [$text]
-#
-# Encode $text for the purpose of embedding safely into a URL. Non-alphanumeric
-# characters are converted to `%XX' sequence where XX represents the hexa-
-# decimal ordinal of the non-alphanumeric character. If $text is missing, data
-# is instead read from standard input.
-#
-f_uriencode_awk='
-BEGIN {
-	output = ""
-	for (n = 0; n < 256; n++) pack[sprintf("%c", n)] = sprintf("%%%02x", n)
-}
-{
-	sline = ""
-	slen = length($0)
-	for (n = 1; n <= slen; n++) {
-		char = substr($0, n, 1)
-		if ( char !~ /^[[:alnum:]_]$/ ) char = pack[char]
-		sline = sline char
-	}
-	output = output ( output ? "%0a" : "" ) sline
-}
-END { print output }
-'
-f_uriencode()
-{
-	if [ $# -gt 0 ]; then
-		echo "$1" | awk "$f_uriencode_awk"
-	else
-		awk "$f_uriencode_awk"
-	fi
-}
-
-# f_uridecode [$text]
-#
-# Decode $text from a URI. Encoded characters are converted from their `%XX'
-# sequence into original unencoded ASCII sequences. If $text is missing, data
-# is instead read from standard input.
-#
-f_uridecode_awk='
-BEGIN { for (n = 0; n < 256; n++) chr[n] = sprintf("%c", n) }
-{
-	sline = ""
-	slen = length($0)
-	for (n = 1; n <= slen; n++)
-	{
-		seq = substr($0, n, 3)
-		if ( seq ~ /^%[[:xdigit:]][[:xdigit:]]$/ ) {
-			hex = substr(seq, 2, 2)
-			sline = sline chr[sprintf("%u", "0x"hex)]
-			n += 2
-		} else
-			sline = sline substr(seq, 1, 1)
-	}
-	print sline
-}
-'
-f_uridecode()
-{
-	if [ $# -gt 0 ]; then
-		echo "$1" | awk "$f_uridecode_awk"
-	else
-		awk "$f_uridecode_awk"
-	fi
-}
-
 # f_replaceall $string $find $replace [$var_to_set]
 #
 # Replace all occurrences of $find in $string with $replace. If $var_to_set is
@@ -493,6 +412,120 @@ f_expand_number()
 	fi
 }
 
+# f_longest_line_length
+#
+# Simple wrapper to an awk(1) script to print the length of the longest line of
+# input (read from stdin). Supports the newline escape-sequence `\n' for
+# splitting a single line into multiple lines.
+#
+f_longest_line_length_awk='
+BEGIN { longest = 0 }
+{
+	if (split($0, lines, /\\n/) > 1)
+	{
+		for (n in lines)
+		{
+			len = length(lines[n])
+			longest = ( len > longest ? len : longest )
+		}
+	}
+	else
+	{
+		len = length($0)
+		longest = ( len > longest ? len : longest )
+	}
+}
+END { print longest }
+'
+f_longest_line_length()
+{
+	awk "$f_longest_line_length_awk"
+}
+
+# f_number_of_lines
+#
+# Simple wrapper to an awk(1) script to print the number of lines read from
+# stdin. Supports newline escape-sequence `\n' for splitting a single line into
+# multiple lines.
+#
+f_number_of_lines_awk='
+BEGIN { num_lines = 0 }
+{
+	num_lines += split(" "$0, unused, /\\n/)
+}
+END { print num_lines }
+'
+f_number_of_lines()
+{
+	awk "$f_number_of_lines_awk"
+}
+
+# f_uriencode [$text]
+#
+# Encode $text for the purpose of embedding safely into a URL. Non-alphanumeric
+# characters are converted to `%XX' sequence where XX represents the hexa-
+# decimal ordinal of the non-alphanumeric character. If $text is missing, data
+# is instead read from standard input.
+#
+f_uriencode_awk='
+BEGIN {
+	output = ""
+	for (n = 0; n < 256; n++) pack[sprintf("%c", n)] = sprintf("%%%02x", n)
+}
+{
+	sline = ""
+	slen = length($0)
+	for (n = 1; n <= slen; n++) {
+		char = substr($0, n, 1)
+		if ( char !~ /^[[:alnum:]_]$/ ) char = pack[char]
+		sline = sline char
+	}
+	output = output ( output ? "%0a" : "" ) sline
+}
+END { print output }
+'
+f_uriencode()
+{
+	if [ $# -gt 0 ]; then
+		echo "$1" | awk "$f_uriencode_awk"
+	else
+		awk "$f_uriencode_awk"
+	fi
+}
+
+# f_uridecode [$text]
+#
+# Decode $text from a URI. Encoded characters are converted from their `%XX'
+# sequence into original unencoded ASCII sequences. If $text is missing, data
+# is instead read from standard input.
+#
+f_uridecode_awk='
+BEGIN { for (n = 0; n < 256; n++) chr[n] = sprintf("%c", n) }
+{
+	sline = ""
+	slen = length($0)
+	for (n = 1; n <= slen; n++)
+	{
+		seq = substr($0, n, 3)
+		if ( seq ~ /^%[[:xdigit:]][[:xdigit:]]$/ ) {
+			hex = substr(seq, 2, 2)
+			sline = sline chr[sprintf("%u", "0x"hex)]
+			n += 2
+		} else
+			sline = sline substr(seq, 1, 1)
+	}
+	print sline
+}
+'
+f_uridecode()
+{
+	if [ $# -gt 0 ]; then
+		echo "$1" | awk "$f_uridecode_awk"
+	else
+		awk "$f_uridecode_awk"
+	fi
+}
+
 ############################################################ MAIN
 
 f_dprintf "%s: Successfully loaded." strings.subr
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index 5c3fc80..ed93c37 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -109,7 +109,12 @@ f_include $BSDCFG_SHARE/variable.subr
 #
 # Default partitioning scheme to use on disks
 #
-: ${ZFSBOOT_PARTITION_SCHEME:=GPT}
+: ${ZFSBOOT_PARTITION_SCHEME:=}
+
+#
+# Default partitioning scheme to use on disks
+#
+: ${ZFSBOOT_BOOT_TYPE:=}
 
 #
 # How much swap to put on each block device in the boot zpool
@@ -193,6 +198,7 @@ GPART_ADD_ALIGN_LABEL='gpart add %s -l %s -t %s "%s"'
 GPART_ADD_ALIGN_LABEL_WITH_SIZE='gpart add %s -l %s -t %s -s %s "%s"'
 GPART_BOOTCODE='gpart bootcode -b "%s" "%s"'
 GPART_BOOTCODE_PART='gpart bootcode -b "%s" -p "%s" -i %s "%s"'
+GPART_BOOTCODE_PARTONLY='gpart bootcode -p "%s" -i %s "%s"'
 GPART_CREATE='gpart create -s %s "%s"'
 GPART_DESTROY_F='gpart destroy -F "%s"'
 GPART_SET_ACTIVE='gpart set -a active -i %s "%s"'
@@ -297,7 +303,6 @@ msg_swap_size="Swap Size"
 msg_swap_size_help="Customize how much swap space is allocated to each selected disk"
 msg_swap_toosmall="The selected swap size (%s) is to small. Please enter a value greater than 100MB or enter 0 for no swap"
 msg_these_disks_are_too_small="These disks are too small given the amount of requested\nswap (%s) and/or geli(8) (%s) partitions, which would\ntake 50%% or more of each of the following selected disk\ndevices (not recommended):\n\n  %s\n\nRecommend changing partition size(s) and/or selecting a\ndifferent set of devices."
-msg_uefi_not_supported="The FreeBSD UEFI loader does not currently support booting root-on-ZFS. Your system will need to boot in legacy (CSM) mode.\nDo you want to continue?"
 msg_unable_to_get_disk_capacity="Unable to get disk capacity of \`%s'"
 msg_unsupported_partition_scheme="%s is an unsupported partition scheme"
 msg_user_cancelled="User Cancelled."
@@ -345,7 +350,7 @@ dialog_menu_main()
 		'E $msg_encrypt_disks'  '$usegeli'
 		                        '$msg_encrypt_disks_help'
 		'P $msg_partition_scheme'
-		                        '$ZFSBOOT_PARTITION_SCHEME'
+		                        '$ZFSBOOT_PARTITION_SCHEME ($ZFSBOOT_BOOT_TYPE)'
 		                        '$msg_partition_scheme_help'
 		'S $msg_swap_size'      '$ZFSBOOT_SWAP_SIZE'
 		                        '$msg_swap_size_help'
@@ -695,48 +700,6 @@ dialog_menu_layout()
 	return $DIALOG_OK
 }
 
-# dialog_uefi_prompt
-#
-# Confirm that the user wants to continue with the installation on a BIOS
-# system when they have booted with UEFI
-#
-dialog_uefi_prompt()
-{
-	local title="$DIALOG_TITLE"
-	local btitle="$DIALOG_BACKTITLE"
-	local prompt # Calculated below
-	local hline="$hline_arrows_tab_enter"
-
-	local height=8 width=50 prefix="   "
-	local plen=${#prefix} list= line=
-	local max_width=$(( $width - 3 - $plen ))
-
-	local yes no defaultno extra_args format
-	if [ "$USE_XDIALOG" ]; then
-		yes=ok no=cancel defaultno=default-no
-		extra_args="--wrap --left"
-		format="$msg_uefi_not_supported"
-	else
-		yes=yes no=no defaultno=defaultno
-		extra_args="--cr-wrap"
-		format="$msg_uefi_not_supported"
-	fi
-
-	# Add height for Xdialog(1)
-	[ "$USE_XDIALOG" ] && height=$(( $height + $height / 5 + 3 ))
-
-	prompt=$( printf "$format" )
-	f_dprintf "%s: UEFI prompt" "$0"
-	$DIALOG \
-		--title "$title"        \
-		--backtitle "$btitle"   \
-		--hline "$hline"        \
-		--$yes-label "$msg_yes" \
-		--$no-label "$msg_no"   \
-		$extra_args             \
-		--yesno "$prompt" $height $width
-}
-
 # zfs_create_diskpart $disk $index
 #
 # For each block device to be used in the zpool, rather than just create the
@@ -848,14 +811,25 @@ zfs_create_diskpart()
 		fi
 
 		#
-		# 2. Add small freebsd-boot partition labeled `boot#'
+		# 2. Add small freebsd-boot or efi partition
 		#
-		f_eval_catch $funcname gpart "$GPART_ADD_ALIGN_LABEL_WITH_SIZE" \
-		             "$align_small" gptboot$index freebsd-boot 512k $disk ||
-		             return $FAILURE
-		f_eval_catch $funcname gpart "$GPART_BOOTCODE_PART" \
-		             /boot/pmbr /boot/gptzfsboot 1 $disk ||
-		             return $FAILURE
+		if [ "$ZFSBOOT_BOOT_TYPE" = "UEFI" ]; then
+			f_eval_catch $funcname gpart \
+			             "$GPART_ADD_ALIGN_LABEL_WITH_SIZE" \
+			             "$align_small" efiboot$index efi 800k $disk ||
+			             return $FAILURE
+			f_eval_catch $funcname gpart "$GPART_BOOTCODE_PARTONLY" \
+			             /boot/boot1.efifat 1 $disk ||
+			             return $FAILURE
+		else
+			f_eval_catch $funcname gpart \
+			             "$GPART_ADD_ALIGN_LABEL_WITH_SIZE" \
+			             "$align_small" gptboot$index freebsd-boot \
+			             512k $disk || return $FAILURE
+			f_eval_catch $funcname gpart "$GPART_BOOTCODE_PART" \
+			             /boot/pmbr /boot/gptzfsboot 1 $disk ||
+			             return $FAILURE
+		fi
 
 		# NB: zpool will use the `zfs#' GPT labels
 		bootpart=p2 swappart=p2 targetpart=p2
@@ -1463,18 +1437,16 @@ f_dprintf "BSDINSTALL_TMPETC=[%s]" "$BSDINSTALL_TMPETC"
 f_dprintf "FSTAB_FMT=[%s]" "$FSTAB_FMT"
 
 #
-# If the system was booted with UEFI, warn the user that FreeBSD can't do
-# ZFS with UEFI yet
+# If the system was booted with UEFI, set the default boot type to UEFI
 #
-if f_interactive; then
-	bootmethod=$( sysctl -n machdep.bootmethod )
-	f_dprintf "machdep.bootmethod=[%s]" "$bootmethod"
-	if [ "$bootmethod" != "BIOS" ]; then
-		dialog_uefi_prompt
-		retval=$?
-		f_dprintf "uefi_prompt=[%s]" "$retval"
-		[ $retval -eq $DIALOG_OK ] || f_die
-	fi
+bootmethod=$( sysctl -n machdep.bootmethod )
+f_dprintf "machdep.bootmethod=[%s]" "$bootmethod"
+if [ "$bootmethod" = "UEFI" ]; then
+	: ${ZFSBOOT_BOOT_TYPE:=UEFI}
+	: ${ZFSBOOT_PARTITION_SCHEME:=GPT}
+else
+	: ${ZFSBOOT_BOOT_TYPE:=BIOS}
+	: ${ZFSBOOT_PARTITION_SCHEME:=GPT}
 fi
 
 #
@@ -1596,15 +1568,22 @@ while :; do
 		fi
 		;;
 	?" $msg_partition_scheme")
-		# Toggle between GPT and MBR
-		if [ "$ZFSBOOT_PARTITION_SCHEME" = GPT ]; then
-			ZFSBOOT_PARTITION_SCHEME=MBR
-		elif [ "$ZFSBOOT_PARTITION_SCHEME" = MBR ]; then
+		# Toggle between GPT (BIOS), GPT (UEFI) and MBR
+		if [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT" -a "$ZFSBOOT_BOOT_TYPE" = "BIOS" ]; then
+			ZFSBOOT_PARTITION_SCHEME="GPT"
+			ZFSBOOT_BOOT_TYPE="UEFI"
+		elif [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT" ]; then
+			ZFSBOOT_PARTITION_SCHEME="MBR"
+			ZFSBOOT_BOOT_TYPE="BIOS"
+		elif [ "$ZFSBOOT_PARTITION_SCHEME" = "MBR" ]; then
 			ZFSBOOT_PARTITION_SCHEME="GPT + Active"
+			ZFSBOOT_BOOT_TYPE="BIOS"
 		elif [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT + Active" ]; then
 			ZFSBOOT_PARTITION_SCHEME="GPT + Lenovo Fix"
+			ZFSBOOT_BOOT_TYPE="BIOS"
 		else
-			ZFSBOOT_PARTITION_SCHEME=GPT
+			ZFSBOOT_PARTITION_SCHEME="GPT"
+			ZFSBOOT_BOOT_TYPE="BIOS"
 		fi
 		;;
 	?" $msg_swap_size")
diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc
index e384dff..aa57f1b 100644
--- a/usr.sbin/sysrc/sysrc
+++ b/usr.sbin/sysrc/sysrc
@@ -790,7 +790,7 @@ while [ $# -gt 0 ]; do
 			delim="${add%"${add#?}"}" # first character
 			oldIFS="$IFS"
 			case "$delim" in
-			""|[$IFS]|[a-zA-Z0-9]) delim=" " ;;
+			""|[$IFS]|[a-zA-Z0-9./]) delim=" " ;;
 			*) IFS="$delim"
 			esac
 			new="$before"
@@ -812,7 +812,7 @@ while [ $# -gt 0 ]; do
 			delim="${remove%"${remove#?}"}" # first character
 			oldIFS="$IFS"
 			case "$delim" in
-			""|[$IFS]|[a-zA-Z0-9]) delim=" " ;;
+			""|[$IFS]|[a-zA-Z0-9./]) delim=" " ;;
 			*) IFS="$delim"
 			esac
 			new=
diff --git a/usr.sbin/sysrc/sysrc.8 b/usr.sbin/sysrc/sysrc.8
index dbd0e4b..3996b1f 100644
--- a/usr.sbin/sysrc/sysrc.8
+++ b/usr.sbin/sysrc/sysrc.8
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2011-2015 Devin Teske
+.\" Copyright (c) 2011-2016 Devin Teske
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 12, 2015
+.Dd February 2, 2016
 .Dt SYSRC 8
 .Os
 .Sh NAME
@@ -255,7 +255,7 @@ When using the
 .Ql key+=value
 syntax to add items to existing values,
 the first character of the value is taken as the delimiter separating items
-.Pq usually Qo \  Qc or Qo , Qc .
+.Pq usually Qo (space) Qc or Qo , Qc .
 For example, in the following statement:
 .Bl -item -offset indent
 .It
@@ -275,6 +275,10 @@ it is added
 .Pp
 For convenience, if the first character is alpha-numeric
 .Pq letters A-Z, a-z, or numbers 0-9 ,
+dot
+.Pq Li . ,
+or slash
+.Pq Li / ,
 .Nm
 uses the default setting of whitespace as separator.
 For example, the above and below statements are equivalent since
@@ -329,6 +333,10 @@ it is removed
 .Pp
 For convenience, if the first character is alpha-numeric
 .Pq letters A-Z, a-z, or numbers 0-9 ,
+dot
+.Pq Li . ,
+or slash
+.Pq Li / ,
 .Nm
 uses the default setting of whitespace as separator.
 For example, the above and below statements are equivalent since