From 10d1f08e2371223b8851e98f3b82f3a15bfa87b7 Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 8 Mar 2013 22:50:16 +0000
Subject: [PATCH] Added check for return code on Linux dd.

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

diff --git a/xCAT-server/lib/xcat/plugins/zvm.pm b/xCAT-server/lib/xcat/plugins/zvm.pm
index 8c3fa6c9a..c0133f6eb 100644
--- a/xCAT-server/lib/xcat/plugins/zvm.pm
+++ b/xCAT-server/lib/xcat/plugins/zvm.pm
@@ -4177,14 +4177,26 @@ sub clone {
                                 
                 # Copy source disk to target disk
                 xCAT::zvmUtils->printLn( $callback, "$tgtNode: Copying source disk ($srcAddr) to target disk ($tgtAddr)" );
-                $out = `ssh $::SUDOER\@$hcp "$::SUDO /bin/dd if=/dev/$srcDevNode of=/dev/$tgtDevNode bs=4096 oflag=sync"`;
+                $out = `ssh $::SUDOER\@$hcp "$::SUDO /bin/dd if=/dev/$srcDevNode of=/dev/$tgtDevNode bs=4096 oflag=sync && $::SUDO echo $?"`;
+                $out = xCAT::zvmUtils->trimStr($out);
+                if (int($out) != 0) {
+                	# If $? is not 0 then there was an error during Linux dd
+                	$out = "(Error) Failed to copy /dev/$srcDevNode";
+                }
+                
                 xCAT::zvmUtils->printSyslog("clone() dd if=/dev/$srcDevNode of=/dev/$tgtDevNode bs=4096 oflag=sync");
                 xCAT::zvmUtils->printSyslog("clone() $out");
             } else {
                 # Copy source disk to target disk
                 # Block size = 512
                 xCAT::zvmUtils->printLn( $callback, "$tgtNode: Copying source disk ($srcAddr) to target disk ($tgtAddr)" );
-                $out = `ssh $::SUDOER\@$hcp "$::SUDO /bin/dd if=/dev/$srcDevNode of=/dev/$tgtDevNode bs=512 oflag=sync"`;
+                $out = `ssh $::SUDOER\@$hcp "$::SUDO /bin/dd if=/dev/$srcDevNode of=/dev/$tgtDevNode bs=512 oflag=sync && $::SUDO echo $?"`;
+                $out = xCAT::zvmUtils->trimStr($out);
+                if (int($out) != 0) {
+                    # If $? is not 0 then there was an error during Linux dd
+                    $out = "(Error) Failed to copy /dev/$srcDevNode";
+                }
+                
                 xCAT::zvmUtils->printSyslog("clone() dd if=/dev/$srcDevNode of=/dev/$tgtDevNode bs=512 oflag=sync");
                 xCAT::zvmUtils->printSyslog("clone() $out");