xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-16 19:30:26 +00:00
Code Issues Releases Wiki Activity

Add --noupdateinitrd option to rinstall (#5523)

Browse Source
This commit is contained in:
Mark Gurevich
2018-08-17 02:49:23 -04:00
committed by yangsong
parent 2b26797195
commit 9659708a96
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/guides/admin-guides/references/man8/nodeset.8.rst
View File

@ -90,7 +90,7 @@ A user can supply their own scripts to be run on the mn or on the service node (
\ **-**\ **-noupdateinitrd**\
Skip the rebuilding of initrd when the 'netdrivers', 'drvierupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the \ **geninitrd**\ command
Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the \ **geninitrd**\ command
should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of \ **nodeset**\ command.

6
docs/source/guides/admin-guides/references/man8/rinstall.8.rst
View File

@ -21,7 +21,7 @@ Name
\ **rinstall**\ \ *noderange*\ [\ **boot**\ | \ **shell**\ | \ **runcmd=**\ \ *command*\ ] [\ **-c | -**\ **-console**\ ] [\ **-V | -**\ **-verbose**\ ]
\ **rinstall**\ \ *noderange*\ \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-ignorekernelchk**\ ] [\ **-c | -**\ **-console**\ ] [\ **-u | -**\ **-uefimode**\ ] [\ **-V | -**\ **-verbose**\ ]
\ **rinstall**\ \ *noderange*\ \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-noupdateinitrd**\ ][\ **-**\ **-ignorekernelchk**\ ] [\ **-c | -**\ **-console**\ ] [\ **-u | -**\ **-uefimode**\ ] [\ **-V | -**\ **-verbose**\ ]
\ **rinstall**\ \ *noderange*\ \ **runimage=**\ \ *task*\
@ -58,6 +58,10 @@ If \ **-c**\ is specified, it will then run \ **rcons**\ on the node. This is
\ **-**\ **-noupdateinitrd**\ Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the \ **geninitrd**\ command should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of \ **rinstall**\ command.
\ **-**\ **-ignorekernelchk**\
Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel.

2
xCAT-client/pods/man8/nodeset.8.pod
View File

@ -63,7 +63,7 @@ Prepare server for installing a node using the specified os image. The os image
=item B<--noupdateinitrd>
Skip the rebuilding of initrd when the 'netdrivers', 'drvierupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the B<geninitrd> command
Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the B<geninitrd> command
should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of B<nodeset> command.
=item B<--ignorekernelchk>

5
xCAT-client/pods/man8/rinstall.8.pod
View File

@ -6,7 +6,7 @@ B<rinstall> - Begin OS provision on a noderange
B<rinstall> I<noderange> [B<boot> | B<shell> | B<runcmd=>I<command>] [B<-c>|B<--console>] [B<-V>|B<--verbose>]
B<rinstall> I<noderange> B<osimage>[=I<imagename>] [B<--ignorekernelchk>] [B<-c>|B<--console>] [B<-u>|B<--uefimode>] [B<-V>|B<--verbose>]
B<rinstall> I<noderange> B<osimage>[=I<imagename>] [B<--noupdateinitrd>][B<--ignorekernelchk>] [B<-c>|B<--console>] [B<-u>|B<--uefimode>] [B<-V>|B<--verbose>]
B<rinstall> I<noderange> B<runimage=>I<task>
@ -32,6 +32,9 @@ Instruct network boot loader to be skipped, generally meaning boot to hard disk
Prepare server for installing a node using the specified OS image. The OS image is defined in the I<osimage> table and I<linuximage> table. If the I<imagename> is omitted, the OS image name will be obtained from I<nodetype.provmethod> for the node.
=item B<--noupdateinitrd>
Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the B<geninitrd> command should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of B<rinstall> command.
=item B<--ignorekernelchk>
Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel.

9
xCAT-server/lib/xcat/plugins/rinstall.pm
View File

@ -70,6 +70,7 @@ sub rinstall {
my $OSIMAGE;
my $STATES;
my $ignorekernelchk;
my $noupdateinitrd;
my $VERBOSE;
my $HELP;
my $VERSION;
@ -135,6 +136,7 @@ sub rinstall {
unless (
GetOptions(
'ignorekernelchk' => \$ignorekernelchk,
'noupdateinitrd' => \$noupdateinitrd,
'V|verbose' => \$VERBOSE,
'h|help' => \$HELP,
'v|version' => \$VERSION,
@ -256,7 +258,10 @@ sub rinstall {
push @parameter, "osimage=$OSIMAGE";
if ($ignorekernelchk) {
push @parameter, " --ignorekernelchk";
push @parameter, "--ignorekernelchk";
}
if ($noupdateinitrd) {
push @parameter, "--noupdateinitrd";
}
}
elsif ($STATES) {
@ -593,7 +598,7 @@ sub usage {
my $rsp = {};
$rsp->{data}->[0] = "Usage:";
$rsp->{data}->[1] = " $command <noderange> [boot | shell | runcmd=<command>] [-c|--console] [-u|--uefimode] [-V|--verbose]";
$rsp->{data}->[2] = " $command <noderange> osimage[=<imagename>] [--ignorekernelchk] [-c|--console] [-u|--uefimode] [-V|--verbose]";
$rsp->{data}->[2] = " $command <noderange> osimage[=<imagename>] [--noupdateinitrd] [--ignorekernelchk] [-c|--console] [-u|--uefimode] [-V|--verbose]";
$rsp->{data}->[3] = " $command <noderange> runimage=<task>";
$rsp->{data}->[4] = " $command [-h|--help|-v|--version]";
xCAT::MsgUtils->message("I", $rsp, $callback);