From 6ecaa6371a340d30c2f818500b377963cf5afdee Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 23 Oct 2010 10:23:45 +0100
Subject: [PATCH] fuse: Add --format option to docs
 (RHBZ#642934,CVE-2010-3851).

This updates commit 44c5ee1163918bd5c9e6aa6c292f0c3bb15b7b25.

Document the --format option in the guestmount manual page.
---
 fuse/guestmount.pod | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/fuse/guestmount.pod b/fuse/guestmount.pod
index 9da7407..fe19a07 100644
--- a/fuse/guestmount.pod
+++ b/fuse/guestmount.pod
@@ -75,6 +75,9 @@ If you want to debug the program, we recommend:
 
 Add a block device or virtual machine image.
 
+The format of the disk image is auto-detected.  To override this and
+force a particular format use the I<--format=..> option.
+
 =item B<--dir-cache-timeout N>
 
 Set the readdir cache timeout to I<N> seconds, the default being 60
@@ -87,6 +90,18 @@ There is also a different attribute cache implemented by FUSE
 (see the FUSE option I<-o attr_timeout>), but the FUSE cache
 does not anticipate future requests, only cache existing ones.
 
+=item B<--format=raw|qcow2|..> | B<--format>
+
+The default for the I<-a> option is to auto-detect the format of the
+disk image.  Using this forces the disk format for I<-a> options which
+follow on the command line.  Using I<--format> with no argument
+switches back to auto-detection for subsequent I<-a> options.
+
+If you have untrusted raw-format guest disk images, you should use
+this option to specify the disk format.  This avoids a possible
+security problem with malicious guests (CVE-2010-3851).  See also
+L</add-drive-opts>.
+
 =item B<--fuse-help>
 
 Display help on special FUSE options (see I<-o> below).
-- 
1.8.3.1