From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 7 Dec 2010 16:51:41 +0000 (+0000)
Subject: debian: Fix ntfs3g available API on Debian.
X-Git-Tag: 1.7.20~4
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=0938509e0422363554023ab99381fd70a22a6e08;p=libguestfs.git

debian: Fix ntfs3g available API on Debian.

Really we should have a test for "is program on $PATH?" but this
fix will do for now.
---

diff --git a/daemon/ntfs.c b/daemon/ntfs.c
index 46b8333..27aa265 100644
--- a/daemon/ntfs.c
+++ b/daemon/ntfs.c
@@ -32,7 +32,11 @@ int
 optgroup_ntfs3g_available (void)
 {
   int r = access ("/bin/ntfs-3g.probe", X_OK);
-  return r == 0;
+  if (r == 0)
+    return 1;
+  /* On Debian: */
+  r = access ("/usr/bin/ntfs-3g.probe", X_OK);
+  return (r == 0);
 }
 
 int