Add 'ntfs_3g_probe' command so we can probe the "mountability" of an NTFS partition.

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index a8ddd67..ea4b721 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -42,6 +42,7 @@ guestfsd_SOURCES = \
        ls.c \
        lvm.c \
        mount.c \
        ls.c \
        lvm.c \
        mount.c \

+       ntfs.c \

        pingdaemon.c \
        proto.c \
        sfdisk.c \
        pingdaemon.c \
        proto.c \
        sfdisk.c \

diff --git a/daemon/ntfs.c b/daemon/ntfs.c
new file mode 100644 (file)
index 0000000..70826df
--- /dev/null
+++ b/daemon/ntfs.c
@@ -0,0 +1,48 @@
+/* libguestfs - the guestfsd daemon
+ * Copyright (C) 2009 Red Hat Inc. 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "daemon.h"
+#include "actions.h"
+
+int
+do_ntfs_3g_probe (int rw, const char *device)
+{
+  char *err;
+  int r;
+  const char *rw_flag;
+
+  IS_DEVICE (device, -1);
+
+  rw_flag = rw ? "-w" : "-r";
+
+  r = commandr (NULL, &err, "ntfs-3g.probe", rw_flag, device, NULL);
+  if (r == -1) {
+    reply_with_error ("ntfs-3g.probe: %s: %s", device, err);
+    free (err);
+    return -1;
+  }
+
+  return r;
+}

diff --git a/src/generator.ml b/src/generator.ml
index ffee564..2113bc4 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -2318,6 +2318,29 @@ This command is only needed because of C<guestfs_resize2fs>
    "\
 Sleep for C<secs> seconds.");
 
    "\
 Sleep for C<secs> seconds.");
 

+  ("ntfs_3g_probe", (RInt "status", [Bool "rw"; String "device"]), 110, [],
+   [InitNone, Always, TestOutputInt (
+      [["sfdisk"; "/dev/sda"; "0"; "0"; "0"; ","];
+       ["mkfs"; "ntfs"; "/dev/sda1"];
+       ["ntfs_3g_probe"; "true"; "/dev/sda1"]], 0);
+    InitNone, Always, TestOutputInt (
+      [["sfdisk"; "/dev/sda"; "0"; "0"; "0"; ","];
+       ["mkfs"; "ext2"; "/dev/sda1"];
+       ["ntfs_3g_probe"; "true"; "/dev/sda1"]], 12)],
+   "probe NTFS volume",
+   "\
+This command runs the L<ntfs-3g.probe(8)> command which probes
+an NTFS C<device> for mountability.  (Not all NTFS volumes can
+be mounted read-write, and some cannot be mounted at all).
+
+C<rw> is a boolean flag.  Set it to true if you want to test
+if the volume can be mounted read-write.  Set it to false if
+you want to test if the volume can be mounted read-only.
+
+The return value is an integer which C<0> if the operation
+would succeed, or some non-zero value documented in the
+L<ntfs-3g.probe(8)> manual page.");
+

 ]
 
 let all_functions = non_daemon_functions @ daemon_functions
 ]
 
 let all_functions = non_daemon_functions @ daemon_functions