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

Remove call to xcatstart and fix tmp file cleanup.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5214 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2010-02-12 18:28:49 +00:00
parent 7e53e77017
commit 2a755fc8ba
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xCAT-server/lib/xcat/plugins/updatenode.pm
View File

@ -1491,7 +1491,7 @@ sub updateAIXsoftware
if ($::RUNCMD_RC != 0)
{
my $rsp;
push @{$rsp->{data}}, "Could not run updtvpkg on node $node.\n";
push @{$rsp->{data}}, "Could not run updtvpkg.\n";
push @{$rsp->{data}}, "$output\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
next;
@ -1523,13 +1523,7 @@ sub updateAIXsoftware
}
my $rcmd;
if ($pkg_string =~ /xCAT/) {
# add temporary hack to handle problem installing
# xCAT rpms that start the xcatd daemon.
$rcmd = qq~rpm $flags $pkg_string; /opt/xcat/sbin/xcatstart -r~;
} else {
$rcmd = qq~rpm $flags $pkg_string~;
}
$rcmd = qq~rpm $flags $pkg_string~;
if ($::VERBOSE)
{
@ -1592,8 +1586,13 @@ sub updateAIXsoftware
foreach $file (@installp_files)
{
my $rcmd =
qq~rm -f $imagedefs{$img}{lpp_loc}/$file; rm -f /tmp/$file~;
my $rcmd;
if ($file =~ /installp_file/) {
$rcmd = qq~rm -f /tmp/$file~;
} else {
$rcmd = qq~rm -f $imagedefs{$img}{lpp_loc}/$file; rm -f /tmp/$file~;
}
my $output = xCAT::Utils->runcmd("$rcmd", -1);
if ($::RUNCMD_RC != 0)