X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=tools%2Fvirt-df;h=45b786944c5c5aa694850dc914646b30d0c809d5;hb=09cf74a339670daeb2e841cdf26082e086ff5fa9;hp=684334d0ad09c410b3c3dc1ede0fb81a5548b681;hpb=29c78cc979297b95407a5956b4caa34240a2f5a8;p=libguestfs.git

diff --git a/tools/virt-df b/tools/virt-df
index 684334d..45b7869 100755
--- a/tools/virt-df
+++ b/tools/virt-df
@@ -20,9 +20,7 @@ use warnings;
 use strict;
 
 use Sys::Guestfs;
-use Sys::Guestfs::Lib qw(open_guest get_partitions resolve_windows_path
-  inspect_all_partitions inspect_partition
-  inspect_operating_systems mount_operating_system inspect_in_detail);
+use Sys::Guestfs::Lib qw(open_guest get_partitions);
 
 use Pod::Usage;
 use Getopt::Long;
@@ -121,6 +119,8 @@ my $human;
 
 Print sizes in human-readable format.
 
+You are not allowed to use I<-h> and I<--csv> at the same time.
+
 =cut
 
 my $inodes;
@@ -148,6 +148,9 @@ if ($version) {
     exit
 }
 
+# RHBZ#600977
+die __"virt-df: cannot use -h and --csv options together\n" if $human && $csv;
+
 # Open the guest handle.
 
 if (@ARGV == 0) {
@@ -165,7 +168,7 @@ if (@ARGV == 0) {
     # https://bugzilla.redhat.com/show_bug.cgi?id=538041
     @doms = grep { $_->get_id () != 0 } @doms;
 
-    my @domnames = map { $_->get_name () } @doms;
+    my @domnames = sort (map { $_->get_name () } @doms);
 
     if (@domnames) {
         print_title ();
@@ -350,11 +353,11 @@ 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
 
-Copyright (C) 2009 Red Hat Inc.
+Copyright (C) 2009-2010 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