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

fix defect 3412

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15766 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2013-04-01 16:46:32 +00:00
parent e01282f5eb
commit 525d1dcb63
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xCAT-server/lib/perl/xCAT/Postage.pm
View File

@ -701,16 +701,16 @@ sub makescript
}
# get postscripts for images
my $osimgname = $provmethod;
my $et2;
if($provmethod !~ /^install$|^netboot$|^statelite$/){ # using imagename
my $osimgname = $provmethod;
if($osimgname =~ /^install$|^netboot$|^statelite$/){
$osimgname = "$os-$arch-$provmethod-$profile";
}
my $et2 =
$et2 =
$ostab->getAttribs({'imagename' => "$osimgname"}, ['postscripts', 'postbootscripts']);
$ps = $et2->{'postscripts'};
if ($ps)
{
$ps = $et2->{'postscripts'};
if ($ps)
{
push @scriptd, "# osimage-postscripts-start-here\n";
foreach my $n (split(/,/, $ps))
@ -722,6 +722,7 @@ sub makescript
}
}
push @scriptd, "# osimage-postscripts-end-here\n";
}
}
# get postscripts for node specific
@ -784,9 +785,10 @@ sub makescript
}
# get postbootscripts for image
my $ips = $et2->{'postbootscripts'};
if ($ips)
{
if($provmethod !~ /^install$|^netboot$|^statelite$/){ # using imagename
my $ips = $et2->{'postbootscripts'};
if ($ips)
{
my @xcatscripts;
my @kitscripts;
my @userscripts;
@ -832,6 +834,7 @@ sub makescript
}
}
push @scriptd, "# osimage-postbootscripts-end-here\n";
}
}

9
xCAT-server/lib/perl/xCAT/Template.pm
View File

@ -1188,12 +1188,11 @@ sub subvars_for_mypostscript {
$os = $et->{'os'};
$arch = $et->{'arch'};
$profile = $et->{'profile'};
my $osimgname;
my $osimgname = $provmethod;
if($osimgname =~ /^(install|netboot|statelite)$/){
$osimgname = "$os-$arch-$provmethod-$profile";
}
if($provmethod !~ /^install$|^netboot$|^statelite$/){ # using imagename
$osimgname = $provmethod;
}
my $osimage_vars;
$osimage_vars = getImageitems_for_node($node, \%image_hash, $nodesetstate);