Fix hurd-any support

Test for /servers instead of /servers/exec to avoid starting an translator
in the mounted system. Also, /hurd/init might be phased out at some point
(Closes: #802053).

diff --git a/debian/changelog b/debian/changelog
index 8f3b42d..62f0015 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+os-prober (1.70) UNRELEASED; urgency=medium
+
+  [ Justus Winter ]
+  * Fix hurd-any support: Test for /servers instead of /servers/exec to avoid
+    starting an translator in the mounted system. Also, /hurd/init might be
+    phased out at some point (Closes: #802053).
+
+ -- Samuel Thibault <sthibault@debian.org>  Sat, 17 Oct 2015 14:26:43 +0200
+
 os-prober (1.68) unstable; urgency=medium
 
   * Adjust extended dos partition support for blkid/util-linux 2.24+,

diff --git a/os-probes/mounted/x86/70hurd b/os-probes/mounted/x86/70hurd
index ffc0a44..af29ff5 100755 (executable)
--- a/os-probes/mounted/x86/70hurd
+++ b/os-probes/mounted/x86/70hurd
@@ -7,7 +7,7 @@ partition="$1"
 dir="$2"
 type="$3"
 
-if [ -e "$dir/servers/exec" ] && [ -x "$dir/hurd/init" ]; then
+if [ -d "$dir/servers" ] && [ -d "$dir/hurd" ]; then
         label="$(count_next_label Hurd)"
        result "$partition:GNU/Hurd:$label:hurd"
        exit 0