diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm index a690ec720..fe0b66681 100644 --- a/xCAT-server/lib/perl/xCAT/Postage.pm +++ b/xCAT-server/lib/perl/xCAT/Postage.pm @@ -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 =