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

Bug fix ID 3369758

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10111 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
angli-xcat 2011-07-19 03:28:44 +00:00
parent 3b22389271
commit 11e62bbf12
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -229,12 +229,14 @@ unless ($onlyinitrd) {
if(-e "$rootimg_dir/etc/zypp/repos.d/$osver.repo") {
system("rm -rf $rootimg_dir/etc/zypp/repos.d/$osver.repo");
}
system("zypper -R $rootimg_dir --non-interactive ar file:$srcdir $osver");
system("zypper -R $rootimg_dir --gpg-auto-import-keys ar file:$srcdir $osver");
if(-e "$rootimg_dir/etc/zypp/repos.d/${osver}sdk.repo") {
system("rm -rf $rootimg_dir/etc/zypp/repos.d/${osver}sdk.repo");
}
my $srcdir_sdk = "$installroot/$osver/$arch/sdk1";
system("zypper -R $rootimg_dir --non-interactive ar file:$srcdir_sdk ${osver}sdk");
if ( -e "$srcdir_sdk") {
system("zypper -R $rootimg_dir --gpg-auto-import-keys ar file:$srcdir_sdk ${osver}sdk");
}
}else {
system("zypper -R $rootimg_dir --non-interactive sa file:$srcdir");
@ -250,7 +252,7 @@ unless ($onlyinitrd) {
if (-e "$rootimg_dir/etc/zypp/repos.d/$kernelver.repo") {
system("rm -rf $rootimg_dir/etc/zypp/repos.d/$kernelver.repo");
}
system("zypper -R $rootimg_dir --non-interactive ar file:$kerneldir $kernelver");
system("zypper -R $rootimg_dir --gpg-auto-import-keys ar file:$kerneldir $kernelver");
} else {
system("zypper -R $rootimg_dir --non-interactive sa file:$kerneldir");
}
@ -276,13 +278,13 @@ unless ($onlyinitrd) {
my $whole_path="$srcdir_otherpkgs/$_";
if (-r "$srcdir_otherpkgs/$_/repodata/repomd.xml") {
if($osver_host == 11) {
system("zypper -R $rootimg_dir --non-interactive ar file:$srcdir_otherpkgs/$_ otherpkg$index");
system("zypper -R $rootimg_dir --gpg-auto-import-keys 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");
system("zypper -R $rootimg_dir --gpg-auto-import-keys ar -t Plaindir file:$srcdir_otherpkgs/$_ otherpkg$index");
}else {
system("zypper -R $rootimg_dir --non-interactive sa -t Plaindir file:$srcdir_otherpkgs/$_");
}
@ -310,12 +312,12 @@ unless ($onlyinitrd) {
chomp;
next if /^\s*#/;
my ($repotype,$repourl,$repoalias) = split m/\|/;
system("zypper -R $rootimg_dir --non-interactive ar $repourl $repoalias");
system("zypper -R $rootimg_dir --gpg-auto-import-keys ar $repourl $repoalias");
}
}
# Refresh the zypper cache in case there is still old data out there
system("zypper -R $rootimg_dir --non-interactive refresh");
system("zypper -R $rootimg_dir --gpg-auto-import-keys refresh");
#my $yumcmd = "yum -y -c /tmp/genimage.$$.yum.conf --installroot=$rootimg_dir --disablerepo=* ";
#$yumcmd .= "install ";