d-i bugs and freeze

[Steven Chamberlain <steven@pyro.eu.org>]

Hi KiBi,

I'd like to fix d-i bugs, but I wonder how the impending freeze
affects this:
  * may I still commit a non-RC bug fix to master
  * is it likely to be uploaded to sid
  * is it likely to get an unblock

As a real example, right now I have a fix for an issue mentioned in
two install reports, which I'd consider severity 'important'.

https://lists.debian.org/debian-bsd/2014/09/msg00125.html
| grub-mkdevicemap (in /target chroot) did not detect any (virtio)
| hard disks.  I had to "Enter device manually" in the dialog and
| specify /dev/vtbd0, which worked.

https://lists.debian.org/debian-bsd/2014/10/msg00445.html
| Apart from that, the grub install step was not able to find the
| disk/partition by default, so I had to specify it in the prompt as
| '/dev/xbd0'.

And the rather simple change is attached.  Not sure what to do.

Thanks,
Regards,
-- 
Steven Chamberlain
steven@pyro.eu.org

diff --git a/debian/changelog b/debian/changelog
index 463efd1..dcff27e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grub-installer (1.101) UNRELEASED; urgency=medium
+
+  * In device_to_disk, recognise vtbd (KVM virtio) and xbd (Xen)
+    disk devices on kfreebsd
+
+ -- Steven Chamberlain <steven@pyro.eu.org>  Fri, 31 Oct 2014 23:28:01 +0000
+
 grub-installer (1.100) unstable; urgency=medium
 
   [ Colin Watson ]
diff --git a/grub-installer b/grub-installer
index 2b61fb6..c29f2f1 100755
--- a/grub-installer
+++ b/grub-installer
@@ -134,7 +134,7 @@ hurd_convert () {
 # This should probably be rewritten using udevadm or similar.
 device_to_disk () {
 	echo "$1" | \
-		sed 's:\(/dev/\(cciss\|ida\|rs\)/c[0-9]d[0-9][0-9]*\|/dev/mmcblk[0-9]\|/dev/\(ad\|ada\|da\)[0-9]\+\|/dev/[hs]d[0-9]\+\|/dev/[a-z]\+\).*:\1:'
+		sed 's:\(/dev/\(cciss\|ida\|rs\)/c[0-9]d[0-9][0-9]*\|/dev/mmcblk[0-9]\|/dev/\(ad\|ada\|da|vtbd|xbd\)[0-9]\+\|/dev/[hs]d[0-9]\+\|/dev/[a-z]\+\).*:\1:'
 }
 
 # Run update-grub in $ROOT