From 4c5f4d8d53ed7d24e142c579da5f258517ba8ace Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 27 Oct 2008 13:50:19 +0000 Subject: [PATCH] -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 --- xCAT-server/lib/xcat/plugins/destiny.pm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm index 90a75493f..a138a8dbe 100644 --- a/xCAT-server/lib/xcat/plugins/destiny.pm +++ b/xCAT-server/lib/xcat/plugins/destiny.pm @@ -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"}); }; }