search for: _check_for_initrd

...s/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm index bbc583f..20e29ff 100644 --- a/perl/lib/Sys/Guestfs/Lib.pm +++ b/perl/lib/Sys/Guestfs/Lib.pm @@ -1343,7 +1343,6 @@ sub inspect_in_detail _check_for_kernels ($g, $os); if ($os->{os} eq "linux") { _find_modprobe_aliases ($g, $os); - _check_for_initrd ($g, $os); } } @@ -1392,48 +1391,170 @@ sub _check_for_applications sub _check_for_kernels { - local $_; - my $g = shift; - my $os = shift; + my ($g, $os) = @_; - my @kernels; + if ($os->{os} eq "linux") { + # Iterate over entries in grub.conf, po...

...ib/Sys/Guestfs/Lib.pm +++ b/perl/lib/Sys/Guestfs/Lib.pm @@ -1342,7 +1342,7 @@ sub inspect_in_detail _check_for_applications ($g, $os); _check_for_kernels ($g, $os); if ($os->{os} eq "linux") { - _check_for_modprobe_aliases ($g, $os); + _find_modprobe_aliases ($g, $os); _check_for_initrd ($g, $os); } } @@ -1436,16 +1436,14 @@ sub _check_for_kernels $os->{kernels} = \@kernels; } -# Check /etc/modprobe.conf to see if there are any specified -# drivers associated with network (ethX) or hard drives. Normally -# one might find something like: -# -# alias eth0 xennet -...

This is a repost of the patch I sent on Friday. I know it was already ACK'd, but I've changed a fair bit in addition to adding the requested POD. Specifically: I discovered that augeas's grub lens wasn't returning cmdline the way I expected. This is fixed. The kernel package, if known, is output as a property of the kernel. The XML output of virt-inspector is updated with all

...~ m{^/files(.*)/alias(?:\[\d*\])?$} - or die("$path doesn't match augeas pattern"); + or die __x("{path} doesn't match augeas pattern", + path => $path); my $file = $1; my $alias; @@ -1220,7 +1234,8 @@ sub _check_for_initrd @modules; $initrd_modules{$version} = \@modules } else { - warn "/boot/$initrd: could not read initrd format"; + warn __x("{filename}: could not read initrd format", + filename => "/boot/$initrd"); } } } diff --git...