From 455cd126ca1d75dd8bfa0102860c315d1451c853 Mon Sep 17 00:00:00 2001 From: sjing Date: Wed, 11 Apr 2012 10:33:50 +0000 Subject: [PATCH] not try to give "Error" message when the return code of actual command is non-zero, instead, use the return code of the actual command as the return code of xcatchroot. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12195 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-client/bin/xcatchroot | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/xCAT-client/bin/xcatchroot b/xCAT-client/bin/xcatchroot index 0339c9dc9..e1b80ac48 100755 --- a/xCAT-client/bin/xcatchroot +++ b/xCAT-client/bin/xcatchroot @@ -266,12 +266,12 @@ else echo "\n\n$msg\n\n" - if [ ${rc} -ne 0 ] - then - error=1 - echo "\nError: The chroot command failed for '$cmd_string'." - echo "Error: The return code from chroot was '${rc}'\n" - fi + #if [ ${rc} -ne 0 ] + #then + # error=1 + # echo "\nError: The chroot command failed for '$cmd_string'." + # echo "Error: The return code from chroot was '${rc}'\n" + #fi # sensitive process has completed @@ -289,8 +289,9 @@ fi /usr/bin/rm $location/xcatchrootscript # all done -if [ $error -eq 1 ] -then - exit 1 -fi -exit 0 +#if [ $error -eq 1 ] +#then +# exit 1 +#fi +#exit 0 +exit ${rc}