--- grub-installer-1.64ubuntu3/grub-installer	2011-06-21 07:13:51.000000000 -0400
+++ grub-installer-1.64ubuntu3/grub-installer.mine	2011-07-18 11:49:48.205301974 -0400
@@ -291,7 +291,7 @@
     /dev/loop)
 	disc_offered_devfs="$bootfs"
 	;;
-    /dev/[hsv]d[a-z0-9]|/dev/xvd[a-z]|/dev/cciss/c[0-9]d[0-9]*|/dev/ida/c[0-9]d[0-9]*|/dev/rs/c[0-9]d[0-9]*|/dev/mmcblk[0-9]|/dev/ad[0-9]*|/dev/da[0-9]*)
+    /dev/[hsv]d[a-z0-9]*|/dev/xvd[a-z]|/dev/cciss/c[0-9]d[0-9]*|/dev/ida/c[0-9]d[0-9]*|/dev/rs/c[0-9]d[0-9]*|/dev/mmcblk[0-9]|/dev/ad[0-9]*|/dev/da[0-9]*)
 	disc_offered_devfs="$prefix"
 	;;
     *)
@@ -715,7 +715,7 @@
 		  sed 's:\(/dev/\(cciss\|ida\|rs\)/c[0-9]d[0-9][0-9]*\|/dev/mmcblk[0-9]\|/dev/\(ad\|da\)[0-9]\+\|/dev/[a-z]\+\).*:\1:')
 		disks="${disks:+$disks }$prefix"
 		case $prefix in
-		    /dev/[hsv]d[a-z]|/dev/xvd[a-z]|/dev/cciss/c[0-9]d[0-9]*|/dev/ida/c[0-9]d[0-9]*|/dev/rs/c[0-9]d[0-9]*|/dev/mmcblk[0-9]|/dev/ad[0-9]*|/dev/da[0-9]*)
+		    /dev/[hsv]d[a-z]*|/dev/xvd[a-z]|/dev/cciss/c[0-9]d[0-9]*|/dev/ida/c[0-9]d[0-9]*|/dev/rs/c[0-9]d[0-9]*|/dev/mmcblk[0-9]|/dev/ad[0-9]*|/dev/da[0-9]*)
 			if [ "$prefix" != "$frdisk_one" ]; then
 				use_disks=1
 			fi
@@ -731,6 +731,12 @@
 elif [ "$frdev" ]; then
 	default_bootdev="$frdev"
 	db_set grub-installer/bootdev "$default_bootdev"
+else
+    # If a preseeded bootdev is set, install to it rather than $default_bootdev_os
+    db_fget grub-installer/bootdev seen
+    if [ "$RET" = true ]; then
+	state=2
+    fi
 fi
 
 db_progress STEP 1