#506 New installer breaks VMware boot media

Reviewed by: Joshua M. Clulow <jmc@joyent.com>

overlay/generic/smartdc/lib/smartos_prompt_config.sh

@@ -713,7 +713,21 @@ promptpool()
 	local layout=""
 	local disks=
 	while [[ /usr/bin/true ]]; do
-		diskinfo -Hp > /var/tmp/mydisks
+		# Skip USB devices and the VMware boot image by default.
+		diskinfo -Hp | nawk '
+			$1 != "USB" {
+				diskinfo = $0;
+				bootdisk = 0;
+				cmd = "fstyp -v /dev/dsk/" $2 "p1 2>/dev/null";
+				while ((cmd | getline) > 0) {
+					if ($0 ~ /^Volume Label:/ && $3 == "SMARTOSBOOT")
+						bootdisk = 1;
+				}
+				close(cmd);
+				if (bootdisk)
+					next;
+				print diskinfo;
+			}' > /var/tmp/mydisks
 		disklayout -f /var/tmp/mydisks $layout > /var/tmp/disklayout.json
 		json error < /var/tmp/disklayout.json | grep . && layout="" && continue
 		prmpt_str="$(printdisklayout /var/tmp/disklayout.json)\n\n"

tools/build_iso

@@ -184,7 +184,7 @@ function bi_generate_usb_file
 	    "${bi_lofidev/lofi/rlofi}"; then
 		fail "failed to partition ${bi_lofidev/lofi/rlofi}"
 	fi
-	echo "y" | pfexec mkfs -F pcfs -o fat=32 ${bi_lofidev/lofi/rlofi}:c
+	echo "y" | pfexec mkfs -F pcfs -o b=SMARTOSBOOT,fat=32 ${bi_lofidev/lofi/rlofi}:c
 	[[ $? -eq 0 ]] || fail "failed to format the usb image"
 	bi_emit_done