arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Bring forward fixes to trunk

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5871 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2010-04-23 16:01:54 +00:00
parent e0358ec35c
commit 67d82b4e51
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.

5
xCAT-server/lib/xcat/plugins/destiny.pm
View File

@@ -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|,)/) {