diff --git a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst index 8e033b961..97ebf1649 100644 --- a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst +++ b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst @@ -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. diff --git a/docs/source/guides/admin-guides/references/man8/rinstall.8.rst b/docs/source/guides/admin-guides/references/man8/rinstall.8.rst index 72c6298d5..26daef119 100644 --- a/docs/source/guides/admin-guides/references/man8/rinstall.8.rst +++ b/docs/source/guides/admin-guides/references/man8/rinstall.8.rst @@ -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. diff --git a/xCAT-client/pods/man8/nodeset.8.pod b/xCAT-client/pods/man8/nodeset.8.pod index 69712a268..a24a0d168 100644 --- a/xCAT-client/pods/man8/nodeset.8.pod +++ b/xCAT-client/pods/man8/nodeset.8.pod @@ -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 command +Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the B command should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of B command. =item B<--ignorekernelchk> diff --git a/xCAT-client/pods/man8/rinstall.8.pod b/xCAT-client/pods/man8/rinstall.8.pod index f12773f4d..e9713bdfc 100644 --- a/xCAT-client/pods/man8/rinstall.8.pod +++ b/xCAT-client/pods/man8/rinstall.8.pod @@ -6,7 +6,7 @@ B - Begin OS provision on a noderange B I [B | B | BI] [B<-c>|B<--console>] [B<-V>|B<--verbose>] -B I B[=I] [B<--ignorekernelchk>] [B<-c>|B<--console>] [B<-u>|B<--uefimode>] [B<-V>|B<--verbose>] +B I B[=I] [B<--noupdateinitrd>][B<--ignorekernelchk>] [B<-c>|B<--console>] [B<-u>|B<--uefimode>] [B<-V>|B<--verbose>] B I BI @@ -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 table and I table. If the I is omitted, the OS image name will be obtained from I 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 command should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of B 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. diff --git a/xCAT-server/lib/xcat/plugins/rinstall.pm b/xCAT-server/lib/xcat/plugins/rinstall.pm index b71a14902..f41f1519e 100644 --- a/xCAT-server/lib/xcat/plugins/rinstall.pm +++ b/xCAT-server/lib/xcat/plugins/rinstall.pm @@ -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 [boot | shell | runcmd=] [-c|--console] [-u|--uefimode] [-V|--verbose]"; - $rsp->{data}->[2] = " $command osimage[=] [--ignorekernelchk] [-c|--console] [-u|--uefimode] [-V|--verbose]"; + $rsp->{data}->[2] = " $command osimage[=] [--noupdateinitrd] [--ignorekernelchk] [-c|--console] [-u|--uefimode] [-V|--verbose]"; $rsp->{data}->[3] = " $command runimage="; $rsp->{data}->[4] = " $command [-h|--help|-v|--version]"; xCAT::MsgUtils->message("I", $rsp, $callback);