diff --git a/xCAT-client/pods/man8/nodeset.8.pod b/xCAT-client/pods/man8/nodeset.8.pod index 44e828efa..968d8f958 100644 --- a/xCAT-client/pods/man8/nodeset.8.pod +++ b/xCAT-client/pods/man8/nodeset.8.pod @@ -41,17 +41,17 @@ User can supply their own scripts to be run on the mn or on the service node (if Instruct network boot loader to be skipped, generally meaning boot to hard disk -=item B<install> +=item B<install>|B<install=profilename>|B<install=<os-architecture-profilename> Prepare server for installing a node according to the table configuration. This will typically mean an unattended install file is created (i.e. kickstart or autoyast), install resources will be verified in tftp and the bulk transfer method (http, ftp, or nfs for example), and the boot loader configuration file will be written. -=item B<netboot> +=item B<netboot>|B<netboot=profilename>|B<netboot=<os-architecture-profilename> Prepare server for deploying diskless nodes. With the diskless solution, the os image will reside in the RAM of the node. -=item B<statelite> +=item B<statelite>|B<statelite=profilename>|B<statelite=<os-architecture-profilename> Prepare server for deploying statelite nodes. Statelite provides an efficient and flexible diskless solution because most of the OS image is NFS mounted read-only, but a configurable list of directories and files can be read-write. The read-write files can either be persistent across reboots, or volatile (restoring to pristine state after reboot). The configuration can be done through B<litefile>, B<litetree> and B<statelite> tables. diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm index 41adb0ace..d3141ce88 100644 --- a/xCAT-server/lib/xcat/plugins/destiny.pm +++ b/xCAT-server/lib/xcat/plugins/destiny.pm @@ -148,11 +148,10 @@ sub setdestiny { my $updateattribs; if ($target) { my $archentries = $nodetypetable->getNodesAttribs($req->{node},['supportedarchs']); - if ($target =~ /^([^-]*)-([^-]*)-([^-]*)-(.*)/) { + if ($target =~ /^([^-]*)-([^-]*)-(.*)/) { $updateattribs->{os}=$1; $updateattribs->{arch}=$2; - $updateattribs->{provmethod}=$3; - $updateattribs->{profile}=$4; + $updateattribs->{profile}=$3; my $nodearch=$2; foreach (@{$req->{node}}) { if ($archentries->{$_}->[0]->{supportedarchs} and $archentries->{$_}->[0]->{supportedarchs} !~ /(^|,)$nodearch(\z|,)/) {