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

remove my code in r13321, back to r13300

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13347 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua
2012-07-26 07:27:08 +00:00
parent f19277afe8
commit c7e782afc4
1 changed files with 4 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,51 +512,10 @@ sub makescript
$stat = "netboot";
}
# generate the default imagename, and get its attributes
my $imagename = "$os-$arch-$provmethod-$profile";
my $linuximagetab = xCAT::Table->new('linuximage', -create => 1);
(my $ref1) =
$linuximagetab->getAttribs({imagename => $imagename},
'pkglist', 'pkgdir', 'otherpkglist',
'otherpkgdir');
if ($ref1)
{
if ($ref1->{'pkglist'})
{
$ospkglist = $ref1->{'pkglist'};
}
if ($ref1->{'pkgdir'})
{
push @scriptd, "OSPKGDIR=" . $ref1->{'pkgdir'} . "\n";
push @scriptd, "export OSPKGDIR\n";
}
if ($ref1->{'otherpkglist'})
{
$pkglist = $ref1->{'otherpkglist'};
}
if ($ref1->{'otherpkgdir'})
{
push @scriptd,
"OTHERPKGDIR=" . $ref1->{'otherpkgdir'} . "\n";
push @scriptd, "export OTHERPKGDIR\n";
}
}
if (!$ospkglist)
{
$ospkglist =
xCAT::SvrUtils->get_pkglist_file_name(
$ospkglist =
xCAT::SvrUtils->get_pkglist_file_name(
"$installroot/custom/$stat/$platform",
$profile, $os, $arch);
}
if (!$ospkglist)
{
$ospkglist =
@@ -565,14 +524,10 @@ sub makescript
$profile, $os, $arch);
}
if (!$pkglist)
{
$pkglist =
xCAT::SvrUtils->get_otherpkgs_pkglist_file_name(
$pkglist =
xCAT::SvrUtils->get_otherpkgs_pkglist_file_name(
"$installroot/custom/$stat/$platform",
$profile, $os, $arch);
}
if (!$pkglist)
{
$pkglist =