X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tools%2Fvirt-list-filesystems;h=5f545cf04c598367b4887da69f2094960d40bdc5;hp=99480958a76df9e481f0630dc29adad0b3f96626;hb=61da709722ec244da1c3c7d4f1a8706f76687cb3;hpb=abe54abdd2a51f8fc6da26d4e5d4773f68da695e

diff --git a/tools/virt-list-filesystems b/tools/virt-list-filesystems
index 9948095..5f545cf 100755
--- a/tools/virt-list-filesystems
+++ b/tools/virt-list-filesystems
@@ -81,6 +81,23 @@ 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 $long;
 
 =item B<-l> | B<--long>
@@ -107,6 +124,7 @@ Getopt::Long::Configure ("bundling");
 GetOptions ("help|?" => \$help,
             "version" => \$version,
             "connect|c=s" => \$uri,
+            "format=s" => \$format,
             "long|l" => \$long,
             "all|a" => \$all,
     ) or pod2usage (2);
@@ -123,9 +141,9 @@ pod2usage (__"virt-list-filesystems: 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 ();
@@ -143,22 +161,22 @@ foreach $dev (@partitions) {
     my $mountable = $@ ? 0 : 1;
     $g->umount_all ();
     if ($mountable) {
-	push @fses, $dev;
+        push @fses, $dev;
     } else {
-	push @not_mountable, $dev;
+        push @not_mountable, $dev;
     }
 }
 
 foreach $dev (@fses) {
     print canonicalize($dev);
     if ($long) {
-	my $fstype;
-	eval { $fstype = $g->vfs_type ($dev); };
-	if ($fstype) {
-	    print " $fstype";
-	} else {
-	    print " unknown";
-	}
+        my $fstype;
+        eval { $fstype = $g->vfs_type ($dev); };
+        if ($fstype) {
+            print " $fstype";
+        } else {
+            print " unknown";
+        }
     }
     print "\n";
 }
@@ -166,13 +184,13 @@ foreach $dev (@fses) {
 # If asked, look in the not_mountable list for potential swap devices.
 if ($all) {
     foreach $dev (@not_mountable) {
-	my $file;
-	eval { $file = $g->file ($dev); };
-	if ($file && $file =~ /\bswap\b/) {
-	    print canonicalize($dev);
-	    print " swap" if $long;
-	    print "\n"
-	}
+        my $file;
+        eval { $file = $g->file ($dev); };
+        if ($file && $file =~ /\bswap\b/) {
+            print canonicalize($dev);
+            print " swap" if $long;
+            print "\n"
+        }
     }
 }
 
@@ -183,17 +201,25 @@ sub canonicalize
     local $_ = shift;
 
     if (m{^/dev/[hv]d([a-z]\d)$}) {
-	return "/dev/sd$1";
+        return "/dev/sd$1";
     }
     $_;
 }
 
+=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-cat(1)>,
 L<virt-tar(1)>,
+L<virt-list-partitions(1)>,
 L<Sys::Guestfs(3)>,
 L<Sys::Guestfs::Lib(3)>,
 L<Sys::Virt(3)>,
@@ -201,7 +227,7 @@ L<http://libguestfs.org/>.
 
 =head1 AUTHOR
 
-Richard W.M. Jones L<http://et.redhat.com/~rjones/>
+Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 
 =head1 COPYRIGHT