--- vm0	2013-11-14 07:48:56.000000000 +0000
+++ vm0.allan	2013-11-18 02:35:52.092289200 +0000
@@ -269,7 +269,7 @@
 	if [ $DEVLAYOUT = mbr ]; then
 		VOLPART="/dev/${VMDEV}s1a"
 	else # Assume gpt (probing would be awesome)
-		VOLPART="/dev/${VMDEV}p1"
+		VOLPART="/dev/${VMDEV}p2"
 	fi
 } # end getvolpart
 
@@ -642,7 +642,8 @@
 	else # Assume gpt
 
 		gpart create -s gpt "$VMDEV"
-		gpart bootcode -b /boot/pmbr "$VMDEV"
+		gpart add -t freebsd-boot -s 256k "$VMDEV"
+		gpart bootcode -b /boot/pmbr -p /boot/gptboot -i 1 "$VMDEV"
 		gpart add -t freebsd-ufs "$VMDEV"
 
 		echo
@@ -650,8 +651,8 @@
 
 		gpart show "$VMDEV"
 		echo
-		echo "vmformat: Running newfs -U ${VMDEV}p1"
-		newfs -U "${VMDEV}p1"
+		echo "vmformat: Running newfs -U ${VMDEV}p2"
+		newfs -U "${VMDEV}p2"
 	fi
 
 	# Destroying the memory devide if a raw volume
@@ -755,7 +756,7 @@
 		BOOTDEV=ada0s1a
 		# vtbd0s1a for VirtIO
 	else # Assume gpt
-		BOOTDEV=ada0p1
+		BOOTDEV=ada0p2
 		# vtbd0p1 for VirtIO
 	fi
 	echo "vminstall: DEBUG: The boot device will be $BOOTDEV"