From 7f995d604af1966969317276f1c531e5738c7369 Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 7 May 2012 15:22:15 +0000
Subject: [PATCH] Changed when old directory entry is removed from xCAT.

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

diff --git a/xCAT-server/lib/xcat/plugins/zvm.pm b/xCAT-server/lib/xcat/plugins/zvm.pm
index 1fc064bc2..7dd269234 100644
--- a/xCAT-server/lib/xcat/plugins/zvm.pm
+++ b/xCAT-server/lib/xcat/plugins/zvm.pm
@@ -1989,9 +1989,6 @@ sub makeVM {
 
         # SCP file over to zHCP
         $out = `scp $userEntry $target:$userEntry`;
-        
-        # Remove user entry
-        $out = `rm $userEntry`;
 
         # Create virtual server
         $out = `ssh $hcp "$::DIR/createvs $userId $userEntry"`;
@@ -2015,8 +2012,10 @@ sub makeVM {
             # Remove user entry file (on zHCP)
             $out = `ssh -o ConnectTimeout=5 $hcp "rm $userEntry"`;
         }
-    }
-    else {
+        
+        # Remove user entry on xCAT
+        $out = `rm $userEntry`;
+    } else {
 
         # Create NOLOG virtual server
         $out = `ssh $hcp "$::DIR/createvs $userId"`;