git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
capitests: Add whitespace in Makefile.
[libguestfs.git]
/
inspector
/
virt-inspector
diff --git
a/inspector/virt-inspector
b/inspector/virt-inspector
index
7f9d220
..
9e12dc8
100755
(executable)
--- a/
inspector/virt-inspector
+++ b/
inspector/virt-inspector
@@
-305,6
+305,7
@@
sub output_filesystems
$xml->startTag ("filesystems");
my @fses = $g->inspect_get_filesystems ($root);
$xml->startTag ("filesystems");
my @fses = $g->inspect_get_filesystems ($root);
+ @fses = sort @fses;
foreach (@fses) {
$xml->startTag ("filesystem",
dev => canonicalize ($_));
foreach (@fses) {
$xml->startTag ("filesystem",
dev => canonicalize ($_));
@@
-376,14
+377,26
@@
sub output_applications
# and package management.
my ($package_format, $package_management);
if (defined $distro) {
# and package management.
my ($package_format, $package_management);
if (defined $distro) {
- if ($distro eq "debian") {
+ if ($distro eq "archlinux") {
+ $package_format = "pacman";
+ $package_management = "pacman";
+ }
+ elsif ($distro eq "debian" || $distro eq "ubuntu") {
$package_format = "deb";
$package_management = "apt";
}
$package_format = "deb";
$package_management = "apt";
}
- elsif ($distro eq "fedora") {
+ elsif ($distro eq "fedora"
|| $distro eq "meego"
) {
$package_format = "rpm";
$package_management = "yum";
}
$package_format = "rpm";
$package_management = "yum";
}
+ elsif ($distro eq "gentoo") {
+ $package_format = "ebuild";
+ $package_management = "portage";
+ }
+ elsif ($distro eq "pardus") {
+ $package_format = "pisi";
+ $package_management = "pisi";
+ }
elsif ($distro =~ /redhat/ || $distro =~ /rhel/) {
if ($major_version >= 5) {
$package_format = "rpm";
elsif ($distro =~ /redhat/ || $distro =~ /rhel/) {
if ($major_version >= 5) {
$package_format = "rpm";