From f3ed115bf5e724a49deb77c8257649ec910adf2d Mon Sep 17 00:00:00 2001 From: immarvin Date: Mon, 22 Feb 2016 03:13:10 -0500 Subject: [PATCH 1/2] add description of -u and -p for rsetboot;patch pasu with the latest version --- xCAT-client/pods/man1/rsetboot.1.pod | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/rsetboot.1.pod b/xCAT-client/pods/man1/rsetboot.1.pod index d9540bc1a..21295325d 100644 --- a/xCAT-client/pods/man1/rsetboot.1.pod +++ b/xCAT-client/pods/man1/rsetboot.1.pod @@ -5,16 +5,14 @@ B - Sets the boot device to be used for BMC-based servers for the next =head1 SYNOPSIS -B I {B|B|B|B|B} +B I {B|B|B|B|B} [B<-u>|B<-p>] B [B<-h>|B<--help>|B<-v>|B<--version>] =head1 DESCRIPTION -B sets the boot media that should be used on the next boot of the specified nodes. After the nodes are -booted with the specified device (e.g. via L), the nodes will return to using the -default boot device specified in the BIOS. Currently this command is only supported for IPMI nodes. +B sets the boot media and boot mode that should be used on the next boot of the specified nodes. After the nodes are booted with the specified device and boot mode (e.g. via L), the nodes will return to using the default boot device specified in the BIOS. Currently this command is only supported for IPMI nodes. =head1 OPTIONS @@ -40,6 +38,14 @@ Boot using the default set in BIOS. Display the current boot setting. +=item B<-u> + +To specify the next boot mode to be "UEFI Mode". From Lenovo NX360 M5, if "-u" is not specified, B will force the next boot mode to be "Legacy Mode". + +=item B<-p> + +To make the specified boot device and boot mode settings persistent. + =back =head1 EXAMPLES From afeffe0df1dad8a50393a85b915687e851830594 Mon Sep 17 00:00:00 2001 From: immarvin Date: Mon, 22 Feb 2016 04:03:48 -0500 Subject: [PATCH 2/2] add description of rsetboot -u/-p in Usage.pm;refine the manpage --- .../references/man1/rsetboot.1.rst | 18 ++++++++++++++---- perl-xCAT/xCAT/Usage.pm | 2 +- xCAT-client/pods/man1/rsetboot.1.pod | 4 ++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst b/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst index 0c8cef953..73f96eaf1 100644 --- a/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst @@ -11,7 +11,7 @@ SYNOPSIS ******** -\ **rsetboot**\ \ *noderange*\ {\ **hd | net | cd | default | stat**\ } +\ **rsetboot**\ \ *noderange*\ {\ **hd | net | cd | default | stat**\ } [\ **-u**\ ] [\ **-p**\ ] \ **rsetboot**\ [\ **-h | -**\ **-help | -v | -**\ **-version**\ ] @@ -21,9 +21,7 @@ DESCRIPTION *********** -\ **rsetboot**\ sets the boot media that should be used on the next boot of the specified nodes. After the nodes are -booted with the specified device (e.g. via rpower(1)|rpower.1), the nodes will return to using the -default boot device specified in the BIOS. Currently this command is only supported for IPMI nodes. +\ **rsetboot**\ sets the boot media and boot mode that should be used on the next boot of the specified nodes. After the nodes are booted with the specified device and boot mode (e.g. via rpower(1)|rpower.1), the nodes will return to using the default boot device specified in the BIOS. Currently this command is only supported for IPMI nodes. ******* @@ -62,6 +60,18 @@ OPTIONS +\ **-u**\ + + To specify the next boot mode to be "UEFI Mode". + + + +\ **-p**\ + + To make the specified boot device and boot mode settings persistent. + + + ******** EXAMPLES diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm index 9bfd043a9..d8fbb63b3 100755 --- a/perl-xCAT/xCAT/Usage.pm +++ b/perl-xCAT/xCAT/Usage.pm @@ -96,7 +96,7 @@ my %usage = ( MIC specific: rinv noderange [system|ver|board|core|gddr|all]", "rsetboot" => -"Usage: rsetboot [net|hd|cd|floppy|def|stat] [-V|--verbose] +"Usage: rsetboot [net|hd|cd|floppy|def|stat] [-V|--verbose] [-u] [-p] rsetboot [-h|--help|-v|--version]", "rbootseq" => "Usage: diff --git a/xCAT-client/pods/man1/rsetboot.1.pod b/xCAT-client/pods/man1/rsetboot.1.pod index 21295325d..c9e6b1fd6 100644 --- a/xCAT-client/pods/man1/rsetboot.1.pod +++ b/xCAT-client/pods/man1/rsetboot.1.pod @@ -5,7 +5,7 @@ B - Sets the boot device to be used for BMC-based servers for the next =head1 SYNOPSIS -B I {B|B|B|B|B} [B<-u>|B<-p>] +B I {B|B|B|B|B} [B<-u>] [B<-p>] B [B<-h>|B<--help>|B<-v>|B<--version>] @@ -40,7 +40,7 @@ Display the current boot setting. =item B<-u> -To specify the next boot mode to be "UEFI Mode". From Lenovo NX360 M5, if "-u" is not specified, B will force the next boot mode to be "Legacy Mode". +To specify the next boot mode to be "UEFI Mode". =item B<-p>