Improve detection of Haiku: detect the 64-bit version Closes: #685228

diff --git a/debian/changelog b/debian/changelog
index d9063c1..c08ef51 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+os-prober (1.55) UNRELEASED; urgency=low
+
+  * Improve detection of Haiku: detect the 64-bit version
+    Closes: #685228
+
+ -- Christian Perrier <bubulle@debian.org>  Sat, 18 Aug 2012 17:51:43 +0200
+
 os-prober (1.54) unstable; urgency=low
 
   * Team upload

diff --git a/os-probes/mounted/x86/83haiku b/os-probes/mounted/x86/83haiku
index b88528c..6de7a1d 100755 (executable)
--- a/os-probes/mounted/x86/83haiku
+++ b/os-probes/mounted/x86/83haiku
@@ -22,7 +22,8 @@ fi
 
 if system="$(item_in_dir "system" "$mpoint")" &&
        item_in_dir -q "haiku_loader" "$mpoint/$system" &&
-       item_in_dir -q "kernel_x86" "$mpoint/$system"
+       (item_in_dir -q "kernel_x86" "$mpoint/$system" ||
+               item_in_dir -q "kernel_x86_64" "$mpoint/$system")
 then
        debug "Stage 2 bootloader and kernel found"
        label="$(count_next_label Haiku)"