From b51d749f133025339e343443da28707e78a34704 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Fri, 22 Mar 2019 15:59:58 +0800
Subject: [PATCH] Remove option -no-host-reboot for rflash

---
 .../management/advanced/rflash/openbmc/openbmc_common.rst  | 7 +------
 perl-xCAT/xCAT/Usage.pm                                    | 2 +-
 xCAT-client/pods/man1/rflash.1.pod                         | 4 +---
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst
index 5f6d11318..46060c9df 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst
@@ -6,17 +6,12 @@ Unattended flash of OpenBMC firmware will do the following events:
 #. Activate both BMC firmware and Host firmware
 #. If BMC firmware becomes activate, reboot BMC to apply new BMC firmware, or else, ``rflash`` will exit
 #. If BMC itself state is ``NotReady``, ``rflash`` will exit
-#. If BMC itself state is ``Ready``, and use ``--no-host-reboot`` option, ``rflash`` will not reboot the compute node
-#. If BMC itself state is ``Ready``, and do not use ``--no-host-reboot`` option, ``rflash`` will reboot the compute node to apply Host firmware
+#. If BMC itself state is ``Ready``, ``rflash`` will reboot the compute node to apply Host firmware
 
 Use the following command to flash the firmware unattended: ::
 
     rflash <noderange> -d /path/to/directory
 
-Use the following command to flash the firmware unattended and not reboot the compute node: ::
-
-    rflash <noderange> -d /path/to/directory --no-host-reboot
-
 If there are errors encountered during the flash process, take a look at the manual steps to continue flashing the BMC.
 
 .. END_unattended_OpenBMC_flashing
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 1ded2c975..d40c13600 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -422,7 +422,7 @@ my %usage = (
     "OpenPOWER OpenBMC specific:
         rflash <noderange> {[-c|--check] | [-l|--list]}
         rflash <noderange> <tar_file_path> {[-c|--check] | [-a|--activate] | [-u|--upload]}
-        rflash <noderange> <tar_file_diretory> [-d] [--no-host-reboot]
+        rflash <noderange> <tar_file_diretory> [-d]
         rflash <noderange> <image_id> {[-a|--activate] | [--delete]}",
     "mkhwconn" =>
       "Usage:
diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod
index 744f9bf20..3682c8408 100644
--- a/xCAT-client/pods/man1/rflash.1.pod
+++ b/xCAT-client/pods/man1/rflash.1.pod
@@ -34,7 +34,7 @@ B<rflash> I<noderange> {[B<-c>|B<--check>] | [B<-l>|B<--list>]}
 
 B<rflash> I<noderange> I<tar_file_path> {[B<-c>|B<--check>] | [B<-a>|B<--activate>] | [B<-u>|B<--upload>]}
 
-B<rflash> I<noderange> I<tar_file_directory> [B<-d>] [B<--no-host-reboot>]
+B<rflash> I<noderange> I<tar_file_directory> [B<-d>]
 
 B<rflash> I<noderange> I<image_id> {[B<-a>|B<--activate>] | [B<--delete>]}
 
@@ -125,8 +125,6 @@ B<-d>:
 
 This option steamlines the update, activate, reboot BMC and reboot HOST procedure. It expects a directory containing both BMC and Host .tar files. When BMC and Host tar files are provided, the command will upload and activate firmware. After BMC becomes activate, it will reboot BMC. If BMC state is Ready, the command will reboot the HOST. If BMC state is NotReady, the command will exit.
 
-B<Note:> When using B<--no-host-reboot>, it will not reboot the host after BMC is reboot.
-
 B<--delete>:
 
 This delete option will delete update image from BMC. It expects an ID as the input.