From 2a755fc8ba83dddb96a9841afdff9e1324ac4999 Mon Sep 17 00:00:00 2001
From: nott <nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 12 Feb 2010 18:28:49 +0000
Subject: [PATCH] Remove call to xcatstart and fix tmp file cleanup.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5214 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/updatenode.pm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm
index 7c11c4c22..a4498cd5a 100644
--- a/xCAT-server/lib/xcat/plugins/updatenode.pm
+++ b/xCAT-server/lib/xcat/plugins/updatenode.pm
@@ -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)