[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, experimental, updated. debian/1%1.21.40-1

[Richard W.M. Jones]

The following commit has been merged in the experimental branch:
commit a820e9e3bd55632d88a2d76581921e1cebd17c62
Author: Dave Vasilevsky <dave at vasilevsky.ca>
Date:   Wed May 8 21:16:51 2013 -0400

    fuse: Document the fstype parameter

diff --git a/fish/fish.c b/fish/fish.c
index 10e03d0..db25373 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -125,7 +125,7 @@ usage (int status)
              "  --keys-from-stdin    Read passphrases from stdin\n"
              "  --listen             Listen for remote commands\n"
              "  --live               Connect to a live virtual machine\n"
-             "  -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
+             "  -m|--mount dev[:mnt[:opts[:fstype]]] Mount dev on mnt (if omitted, /)\n"
              "  --network            Enable network\n"
              "  -N|--new type        Create prepared disk (test1.img, ...)\n"
              "  -n|--no-sync         Don't autosync\n"
diff --git a/fish/guestfish.pod b/fish/guestfish.pod
index 09c69c6..8382f89 100644
--- a/fish/guestfish.pod
+++ b/fish/guestfish.pod
@@ -313,9 +313,9 @@ L</REMOTE CONTROL GUESTFISH OVER A SOCKET> below.
 Connect to a live virtual machine.
 (Experimental, see L<guestfs(3)/ATTACHING TO RUNNING DAEMONS>).
 
-=item B<-m dev[:mountpoint[:options]]>
+=item B<-m dev[:mountpoint[:options[:fstype]]]>
 
-=item B<--mount dev[:mountpoint[:options]]>
+=item B<--mount dev[:mountpoint[:options[:fstype]]]>
 
 Mount the named partition or logical volume on the given mountpoint.
 
@@ -344,6 +344,11 @@ filesystem can support them:
 
 Using this flag is equivalent to using the C<mount-options> command.
 
+The fourth part of the parameter is the filesystem driver to use, such
+as C<ext3> or C<ntfs>. This is rarely needed, but can be useful if
+multiple drivers are valid for a filesystem (eg: C<ext2> and C<ext3>),
+or if libguestfs misidentifies a filesystem.
+
 =item B<--network>
 
 Enable QEMU user networking in the guest.
diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index c53eed0..9e59048 100644
--- a/fuse/guestmount.c
+++ b/fuse/guestmount.c
@@ -117,7 +117,7 @@ usage (int status)
              "  --help               Display help message and exit\n"
              "  --keys-from-stdin    Read passphrases from stdin\n"
              "  --live               Connect to a live virtual machine\n"
-             "  -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
+             "  -m|--mount dev[:mnt[:opts[:fstype]] Mount dev on mnt (if omitted, /)\n"
              "  --no-fork            Don't daemonize\n"
              "  -n|--no-sync         Don't autosync\n"
              "  -o|--option opt      Pass extra option to FUSE\n"
diff --git a/fuse/guestmount.pod b/fuse/guestmount.pod
index 6a005d1..b9e93de 100644
--- a/fuse/guestmount.pod
+++ b/fuse/guestmount.pod
@@ -254,9 +254,9 @@ to try to read passphrases from the user by opening C</dev/tty>.
 Connect to a live virtual machine.
 (Experimental, see L<guestfs(3)/ATTACHING TO RUNNING DAEMONS>).
 
-=item B<-m dev[:mountpoint[:options]]>
+=item B<-m dev[:mountpoint[:options[:fstype]]>
 
-=item B<--mount dev[:mountpoint[:options]]>
+=item B<--mount dev[:mountpoint[:options[:fstype]]]>
 
 Mount the named partition or logical volume on the given mountpoint
 B<in the guest> (this has nothing to do with mountpoints in the host).
@@ -274,6 +274,11 @@ filesystem can support them:
 
  -m /dev/sda1:/:acl,user_xattr
 
+The fourth part of the parameter is the filesystem driver to use, such
+as C<ext3> or C<ntfs>. This is rarely needed, but can be useful if
+multiple drivers are valid for a filesystem (eg: C<ext2> and C<ext3>),
+or if libguestfs misidentifies a filesystem.
+
 =item B<--no-fork>
 
 Don't daemonize (or fork into the background).

-- 
Libguestfs Debian packaging