--- update-grub.orig	2008-10-18 01:23:05.000000000 -0400
+++ update-grub	2008-10-18 02:14:08.000000000 -0400
@@ -350,12 +350,17 @@
 # should update-grub remember the default entry
 updatedefaultentry="false"
 
-# Drive(in GRUB terms) where the kernel is located. Overridden by the
+# Derive (in GRUB terms) where the kernel is located. Overridden by the
 # kopt statement in menufile.
 # if we don't have a device.map then we can't use the convert function.
 
 # Try to use a UUID instead of the GRUB device name.
-uuid=$(convert_to_uuid "$root_device")
+if test -z "$boot_device" ; then
+	uuid=$(convert_to_uuid "$root_device")
+else
+	uuid=$(convert_to_uuid "$boot_device")
+fi
+
 if [ -n "$uuid" ]; then
 	grub_root_device="$uuid"
 fi