arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix lskmodules sending back empty xcatresponse structures

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14253 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor 2012-11-05 18:54:38 +00:00
parent 39ea0f5a16
commit e1dead42b1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/kmodules.pm
View File

@ -314,7 +314,7 @@ sub lskmodules {
}
# Return the module list for this rpm/img file
my $rsp={};
my $rsp;
foreach my $mn (@modlist) {
if ($::opt_x) {
my %data_entry;
@ -326,7 +326,9 @@ sub lskmodules {
}
}
#xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
$::CALLBACK->($rsp);
if ( $rsp ) {
$::CALLBACK->($rsp);
}
}
@ -569,7 +571,7 @@ sub mods_in_rpm {
my $tmp_path = "/tmp/lskmodules_expanded_rpm";
mkpath($tmp_path);
if (-r $krpm) {
if (system ("cd $tmp_path; rpm2cpio $krpm | cpio -idum *.ko")) {
if (system ("cd $tmp_path; rpm2cpio $krpm | cpio -idum *.ko > /dev/null 2>&1 ; cd - > /dev/null 2>&1")) {
my $rsp;
push @{ $rsp->{data} }, "Unable to extract files from the rpm $krpm.";
xCAT::MsgUtils->message( "E", $rsp, $::CALLBACK );