diff -Nru os-prober-1.56/debian/changelog os-prober-1.56+nmu1/debian/changelog
--- os-prober-1.56/debian/changelog	2012-09-17 14:02:31.000000000 -0400
+++ os-prober-1.56+nmu1/debian/changelog	2012-11-12 16:52:05.000000000 -0500
@@ -1,3 +1,12 @@
+os-prober (1.56+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Ignore non-zero grub-probe error codes to avoid hanging on certain
+    partitions (closes: #680084).
+    - Patch thanks to Integeri.
+
+ -- Michael Gilbert <mgilbert@debian.org>  Mon, 12 Nov 2012 21:32:17 +0000
+
 os-prober (1.56) unstable; urgency=low
 
   [ Hedayat Vatankhah ]
diff -Nru os-prober-1.56/linux-boot-probes/common/50mounted-tests os-prober-1.56+nmu1/linux-boot-probes/common/50mounted-tests
--- os-prober-1.56/linux-boot-probes/common/50mounted-tests	2012-03-27 10:42:12.000000000 -0400
+++ os-prober-1.56+nmu1/linux-boot-probes/common/50mounted-tests	2012-11-12 16:37:32.000000000 -0500
@@ -38,7 +38,7 @@
    type grub-probe >/dev/null 2>&1 && \
    grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
 	mounted=1
-	type="$(grub-probe -d "$partition" -t fs)"
+	type="$(grub-probe -d "$partition" -t fs)" || true
 	[ "$type" ] || type=fuseblk
 else
 	ro_partition "$partition"
diff -Nru os-prober-1.56/os-probes/common/50mounted-tests os-prober-1.56+nmu1/os-probes/common/50mounted-tests
--- os-prober-1.56/os-probes/common/50mounted-tests	2012-09-17 11:08:12.000000000 -0400
+++ os-prober-1.56+nmu1/os-probes/common/50mounted-tests	2012-11-12 16:37:24.000000000 -0500
@@ -50,7 +50,7 @@
    type grub-probe >/dev/null 2>&1 && \
    grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
 	mounted=1
-	type="$(grub-probe -d "$partition" -t fs)"
+	type="$(grub-probe -d "$partition" -t fs)" || true
 	if [ "$type" ]; then
 		debug "mounted using GRUB $type filesystem driver"
 	else