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

Yum.pm should be invoked only when we use rhels5 medias for "copycd" command. In case of multiple unexpected errors when using other distributions.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9948 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
angli-xcat 2011-06-27 09:29:27 +00:00
parent 1d6f346366
commit 4a049ff09f
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
perl-xCAT/xCAT/Yum.pm
View File

@ -44,6 +44,15 @@ sub fix_directory {
print $yumrepofile "enabled=1\n";
print $yumrepofile "gpgcheck=0\n\n";
$grep_result = system("grep sha256 $dirlocation/repomd.xml|grep \\<checksum");
if( $grep_result == 0 )
{
$sha_command = "sha256sum";
}
else
{
$sha_command = "sha1sum";
}
#-----------------------------------------------------------------------
my $oldsha;
my $newsha;
@ -52,7 +61,7 @@ sub fix_directory {
if( -r "$dirlocation/primary.xml.gz")
{
$oldsha=`/usr/bin/sha1sum $dirlocation/primary.xml.gz`;
$oldsha=`/usr/bin/$sha_command $dirlocation/primary.xml.gz`;
$oldsha =~ s/\s.*//;
chomp($oldsha);
@ -63,7 +72,7 @@ sub fix_directory {
}
system("/bin/gunzip $dirlocation/primary.xml.gz");
$oldopensha=`/usr/bin/sha1sum $dirlocation/primary.xml`;
$oldopensha=`/usr/bin/$sha_command $dirlocation/primary.xml`;
$oldopensha =~ s/\s+.*//;
chomp($oldopensha);
@ -78,12 +87,12 @@ sub fix_directory {
@xmlines=();
close($primaryxml);
$newopensha=`/usr/bin/sha1sum $dirlocation/primary.xml`;
$newopensha=`/usr/bin/$sha_command $dirlocation/primary.xml`;
$newopensha =~ s/\s.*//;
chomp($newopensha);
system("/bin/gzip $dirlocation/primary.xml");
$newsha=`/usr/bin/sha1sum $dirlocation/primary.xml.gz`;
$newsha=`/usr/bin/$sha_command $dirlocation/primary.xml.gz`;
$newsha =~ s/\s.*//;
chomp($newsha);
}
@ -97,7 +106,7 @@ sub fix_directory {
if (-r "$dirlocation/primary.sqlite.bz2") {
$olddbsha =`/usr/bin/sha1sum $dirlocation/primary.sqlite.bz2`;
$olddbsha =`/usr/bin/$sha_command $dirlocation/primary.sqlite.bz2`;
$olddbsha =~ s/\s.*//;
chomp($olddbsha);
@ -108,19 +117,19 @@ sub fix_directory {
}
system("/usr/bin/bunzip2 $dirlocation/primary.sqlite.bz2");
$olddbopensha=`/usr/bin/sha1sum $dirlocation/primary.sqlite`;
$olddbopensha=`/usr/bin/$sha_command $dirlocation/primary.sqlite`;
$olddbopensha =~ s/\s+.*//;
chomp($olddbopensha);
my $pdbh = DBI->connect("dbi:SQLite:$dirlocation/primary.sqlite","","",{AutoCommit=>1});
$pdbh->do('UPDATE "packages" SET "location_base" = NULL');
$pdbh->disconnect;
$newdbopensha=`/usr/bin/sha1sum $dirlocation/primary.sqlite`;
$newdbopensha=`/usr/bin/$sha_command $dirlocation/primary.sqlite`;
$newdbopensha =~ s/\s.*//;
chomp($newdbopensha);
system("/usr/bin/bzip2 $dirlocation/primary.sqlite");
$newdbsha=`/usr/bin/sha1sum $dirlocation/primary.sqlite.bz2`;
$newdbsha=`/usr/bin/$sha_command $dirlocation/primary.sqlite.bz2`;
$newdbsha =~ s/\s.*//;
chomp($newdbsha);
}
@ -130,6 +139,14 @@ sub fix_directory {
#update repomd.xml
open($primaryxml,"+<$dirlocation/repomd.xml");
while (<$primaryxml>) {
if($_ =~ m/\<size\>/)
{
next;
}
if($_ =~ m/\<open-size\>/)
{
next;
}
s!xml:base="media://[^"]*"!!g;
if(defined($oldsha)){
s!$oldsha!$newsha!g;

5
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@ -1410,7 +1410,10 @@ sub copycd
#my $rc = system("cd $path;rsync -a . $installroot/$distname/$arch/");
chmod 0755, "$installroot/$distname/$arch";
require xCAT::Yum;
xCAT::Yum->localize_yumrepo($installroot, $distname, $arch);
if($distname =~ /rhels5/)
{
xCAT::Yum->localize_yumrepo($installroot, $distname, $arch);
}
if ($rc != 0)
{
$callback->({error => "Media copy operation failed, status $rc"});