-Have winshell not be so picky about table space, have more accurate output

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2389 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-10-27 13:50:19 +00:00
parent 2f4020a0b3
commit 4c5f4d8d53

@ -96,15 +96,21 @@ sub setdestiny {
foreach (@{$req->{node}}) {
$nstates{$_} = $state; #local copy of state variable for mod
my $ntent = $ntents->{$_}->[0]; #$nodetype->getNodeAttribs($_,[qw(os arch profile)]);
if ($ntent and $ntent->{os}) {
$nstates{$_} .= " ".$ntent->{os};
} else { $errored =1; $callback->({error=>"nodetype.os not defined for $_"}); }
if ($state ne "winshell") {
if ($ntent and $ntent->{os}) {
$nstates{$_} .= " ".$ntent->{os};
} else { $errored =1; $callback->({error=>"nodetype.os not defined for $_"}); }
} else {
$nstates{$_} .= " winpe";
}
if ($ntent and $ntent->{arch}) {
$nstates{$_} .= "-".$ntent->{arch};
} else { $errored =1; $callback->({error=>"nodetype.arch not defined for $_"}); }
if ($ntent and $ntent->{profile}) {
$nstates{$_} .= "-".$ntent->{profile};
} else { $errored =1; $callback->({error=>"nodetype.profile not defined for $_"}); }
if ($state ne "winshell") {
if ($ntent and $ntent->{profile}) {
$nstates{$_} .= "-".$ntent->{profile};
} else { $errored =1; $callback->({error=>"nodetype.profile not defined for $_"}); }
}
if ($errored) {return;}
unless ($state =~ /^netboot/) { $chaintab->setNodeAttribs($_,{currchain=>"boot"}); };
}