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

fixed bug 3264 , support the multiple paths for osimage.pkgdir in the sles11 genimage

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14695 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2012-12-21 07:56:14 +00:00
parent 63400588bc
commit 03b2373420
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ unless ($arch) {
$srcdir="$installroot/$osver/$arch" unless ($srcdir);
$updates{'pkgdir'} = $srcdir if ($tempfile);
$srcdir = $srcdir . "/1";
#$srcdir = $srcdir . "/1";
$srcdir_otherpkgs = "$installroot/post/otherpkgs/$osver/$arch" unless ($srcdir_otherpkgs);
$updates{'otherpkgdir'} = $srcdir_otherpkgs if ($tempfile);
@ -246,19 +246,34 @@ unless ($onlyinitrd) {
if (!$prompt) { $non_interactive="--non-interactive --no-gpg-checks"; }
if($osver_host == 11) {#zypper in SLES11 is different
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");
if(-e "$rootimg_dir/etc/zypp/repos.d/${osver}sdk.repo") {
system("rm -rf $rootimg_dir/etc/zypp/repos.d/${osver}sdk.repo");
system("rm -rf $rootimg_dir/etc/zypp/repos.d/$osver-*.repo");
my @pkgdirs = split(",", $srcdir);
my $dir;
my $i = 0;
# To support multiple paths for osimage.pkgdir
foreach $dir (@pkgdirs) {
if( -d "$dir/1") {
$dir .= "/1";
}
system("zypper -R $rootimg_dir $non_interactive ar file:$dir $osver-$i");
$i++;
}
#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");
#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";
if ( -e "$srcdir_sdk") {
system("zypper -R $rootimg_dir $non_interactive ar file:$srcdir_sdk ${osver}sdk");
}
}else {
$srcdir = $srcdir . "/1";
system("zypper -R $rootimg_dir $non_interactive sa file:$srcdir");
}