From d3a34f4a13b2c983cdb8918ec63beafa0c4fa438 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Wed, 13 Dec 2017 04:52:15 -0500
Subject: [PATCH] enhance rflash

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 53423fc63..6c027af7f 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1135,7 +1135,9 @@ sub parse_args {
                     closedir(DIR);
                 } elsif ($option_flag =~ /^-c$|^--check$|^-u$|^--upload$|^-a$|^--activate$/) {
                     return ([ 1, "Invalid firmware specified with $option_flag" ]);
-                }
+                } else {
+                    return ([ 1, "Invalid option specified" ]);
+                }        
             } else {
                 # Neither Filename nor updateid was not passed, check flags allowed without file or updateid
                 if ($option_flag !~ /^-c$|^--check$|^-l$|^--list$/) {
@@ -2259,7 +2261,7 @@ sub rpower_response {
                     } else {
                         $node_info{$node}{wait_start} = time();
                     }
-                    retry_after($node, $next_status{ $node_info{$node}{cur_status} }, $::BMC_CHECK_INTERVAL);
+                    retry_after($node, "RPOWER_BMC_STATUS_REQUEST", $::BMC_CHECK_INTERVAL);
                     return;
                 } else {
                     my $wait_time_X = $node_info{$node}{wait_end} - $node_info{$node}{wait_start};