X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tools%2Fvirt-list-partitions;h=3b8ee4bbcdbb8665d498dcb0523c5e65e2383ccc;hp=8bda62ef3281f5ad2cceba52d88d8f536dd83acc;hb=a7740cb19a6991d21dc9395dffb87d69ee5986b5;hpb=9a608a1516bd339dc6d5ebe9952d3bced273c416

diff --git a/tools/virt-list-partitions b/tools/virt-list-partitions
index 8bda62e..3b8ee4b 100755
--- a/tools/virt-list-partitions
+++ b/tools/virt-list-partitions
@@ -14,7 +14,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use warnings;
 use strict;
@@ -39,6 +39,9 @@ virt-list-partitions - List partitions in a virtual machine or disk image
 
 =head1 DESCRIPTION
 
+This tool is obsolete.  Use L<virt-filesystems(1)> as a more
+flexible replacement.
+
 C<virt-list-partitions> is a command line tool to list
 the partitions that are contained in a virtual machine or
 disk image.  It is mainly useful as a first step to using
@@ -72,7 +75,9 @@ Display version number and exit.
 
 my $uri;
 
-=item B<--connect URI> | B<-c URI>
+=item B<-c URI>
+
+=item B<--connect URI>
 
 If using libvirt, connect to the given I<URI>.  If omitted, then we
 connect to the default libvirt hypervisor.
@@ -82,9 +87,28 @@ at all.
 
 =cut
 
+my $format;
+
+=item B<--format> raw
+
+Specify the format of disk images given on the command line.  If this
+is omitted then the format is autodetected from the content of the
+disk image.
+
+If disk images are requested from libvirt, then this program asks
+libvirt for this information.  In this case, the value of the format
+parameter is ignored.
+
+If working with untrusted raw-format guest disk images, you should
+ensure the format is always specified.
+
+=cut
+
 my $human;
 
-=item B<-h> | B<--human-readable>
+=item B<-h>
+
+=item B<--human-readable>
 
 Show sizes in human-readable form (eg. "1G").
 
@@ -92,7 +116,9 @@ Show sizes in human-readable form (eg. "1G").
 
 my $long;
 
-=item B<-l> | B<--long>
+=item B<-l>
+
+=item B<--long>
 
 With this option, C<virt-list-partitions> displays the type
 and size of each partition too (where "type" means C<ext3>, C<pv> etc.)
@@ -101,7 +127,9 @@ and size of each partition too (where "type" means C<ext3>, C<pv> etc.)
 
 my $total;
 
-=item B<-t> | B<--total>
+=item B<-t>
+
+=item B<--total>
 
 Display the total size of each block device (as a separate row or
 rows).
@@ -116,6 +144,7 @@ Getopt::Long::Configure ("bundling");
 GetOptions ("help|?" => \$help,
             "version" => \$version,
             "connect|c=s" => \$uri,
+            "format=s" => \$format,
             "human-readable|h" => \$human,
             "long|l" => \$long,
             "total|t" => \$total,
@@ -133,9 +162,9 @@ pod2usage (__"virt-list-partitions: no image or VM name given")
 
 my $g;
 if ($uri) {
-    $g = open_guest (\@ARGV, address => $uri);
+    $g = open_guest (\@ARGV, address => $uri, format => $format);
 } else {
-    $g = open_guest (\@ARGV);
+    $g = open_guest (\@ARGV, format => $format);
 }
 
 $g->launch ();
@@ -226,10 +255,18 @@ sub human_size
     }
 }
 
+=head1 SHELL QUOTING
+
+Libvirt guest names can contain arbitrary characters, some of which
+have meaning to the shell such as C<#> and space.  You may need to
+quote or escape these characters on the command line.  See the shell
+manual page L<sh(1)> for details.
+
 =head1 SEE ALSO
 
 L<guestfs(3)>,
 L<guestfish(1)>,
+L<virt-filesystems(1)>,
 L<virt-list-filesystems(1)>,
 L<virt-resize(1)>,
 L<Sys::Guestfs(3)>,
@@ -257,4 +294,4 @@ 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.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.