Deal with grub-probe exiting with non zero status on some devices, which in turns...

diff --git a/debian/changelog b/debian/changelog
index f26487a..1e635b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+os-prober (1.57) UNRELEASED; urgency=low
+
+  * Deal with grub-probe exiting with non zero status on some
+    devices, which in turns can stuck update-grub
+    Closes: #680084
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 03 Nov 2012 17:48:32 +0100
+
 os-prober (1.56) unstable; urgency=low
 
   [ Hedayat Vatankhah ]

diff --git a/os-probes/common/50mounted-tests b/os-probes/common/50mounted-tests
index 45b4b53..561163b 100755 (executable)
--- a/os-probes/common/50mounted-tests
+++ b/os-probes/common/50mounted-tests
@@ -50,7 +50,7 @@ if type grub-mount >/dev/null 2>&1 && \
    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