git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
edit: Clean up temporary files.
[libguestfs.git]
/
tools
/
virt-df
diff --git
a/tools/virt-df
b/tools/virt-df
index
17aed4a
..
45b7869
100755
(executable)
--- a/
tools/virt-df
+++ b/
tools/virt-df
@@
-20,9
+20,7
@@
use warnings;
use strict;
use Sys::Guestfs;
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;
use Pod::Usage;
use Getopt::Long;
@@
-121,6
+119,8
@@
my $human;
Print sizes in human-readable format.
Print sizes in human-readable format.
+You are not allowed to use I<-h> and I<--csv> at the same time.
+
=cut
my $inodes;
=cut
my $inodes;
@@
-148,6
+148,9
@@
if ($version) {
exit
}
exit
}
+# RHBZ#600977
+die __"virt-df: cannot use -h and --csv options together\n" if $human && $csv;
+
# Open the guest handle.
if (@ARGV == 0) {
# 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;
# 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 ();
if (@domnames) {
print_title ();