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

Fixing a problem that sles enables all the repos for new #NEW_INSTALL_LIST set, it prevents putting multiple versions of a packages with different repos into otherpkgs dir

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15761 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2013-04-01 12:09:26 +00:00
parent 85e66bdcfc
commit a1fdfce779
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
xCAT-server/share/xcat/netboot/sles/genimage
View File

@ -472,6 +472,42 @@ unless ($onlyinitrd) {
}
foreach $pass (sort (keys(%extra_hash))) {
my $index=1;
#remove the old repository for extra packages
if ($osver_host == 11) {
my $result=`zypper -R $rootimg_dir $non_interactive lr |grep otherpkg|cut -f2 -d '|'|tr "\n" " "`;
if ($result =~ /\S/) {
system("zypper -R $rootimg_dir $non_interactive rr $result");
}
} else {
my $result=`zypper -R $rootimg_dir $non_interactive sl |grep otherpkg|cut -f2 -d '|'|tr "\n" " "`;
if ($result =~ /\S/) {
system("zypper -R $rootimg_dir $non_interactive sd $result");
}
}
foreach (keys(%{$extra_hash{$pass}})) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next;}
if (-r "$srcdir_otherpkgs/$_/repodata/repomd.xml") {
if($osver_host == 11) {
system("zypper -R $rootimg_dir $non_interactive ar file:$srcdir_otherpkgs/$_ otherpkg$index");
} else {
system("zypper -R $rootimg_dir $non_interactive sa file:$srcdir_otherpkgs/$_");
}
} else {
if($osver_host == 11) {
system("zypper -R $rootimg_dir $non_interactive ar -t Plaindir file:$srcdir_otherpkgs/$_ otherpkg$index");
}else {
system("zypper -R $rootimg_dir $non_interactive sa -t Plaindir file:$srcdir_otherpkgs/$_");
}
}
$index++;
}
# Refresh the zypper cache in case there is still old data out there
system("zypper -R $rootimg_dir $non_interactive refresh");
#remove the packages that are specified in the otherpkgs.list files with leading '-'
my $envlist;
if(exists $extra_hash{$pass}{ENVLIST}){
@ -491,7 +527,7 @@ unless ($onlyinitrd) {
#add extra packages in the list
if ($extrapkgnames{$pass}) {
print "$envlist yumcmd $extrapkgnames{$pass}\n";
print "$envlist $yumcmd $extrapkgnames{$pass}\n";
$rc = system("$envlist $yumcmd $extrapkgnames{$pass}");
$rc = $rc >> 8;
if (($rc) && ($rc != '104')) {