From 23759f22fc1afc6054f0b12e72c2d3e5016e272f Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Fri, 3 Aug 2018 02:34:24 -0400
Subject: [PATCH] check BMC state after BMCreboot in rflash -d

---
 xCAT-server/lib/xcat/plugins/openbmc.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index ec38c259a..0a5c12690 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -2447,8 +2447,13 @@ sub deal_with_response {
             if ($node_info{$node}{cur_status} eq "RPOWER_RESET_RESPONSE" and defined $status_info{RPOWER_RESET_RESPONSE}{argv} and $status_info{RPOWER_RESET_RESPONSE}{argv} =~ /bmcreboot$/) { 
                 my $infomsg = "BMC $::POWER_STATE_REBOOT";
                 xCAT::SvrUtils::sendmsg($infomsg, $callback, $node);
-                $wait_node_num--;
-                return;    
+                if ($::UPLOAD_ACTIVATE_STREAM) {
+                    retry_after($node, "RPOWER_BMC_CHECK_REQUEST", 15);
+                    return;
+                }else{
+                    $wait_node_num--;
+                    return;
+                }    
             }
             $error = $::RESPONSE_SERVICE_TIMEOUT;
         } else {