From 9598c45746d7d1e64a2648edddf06f373dc6d9f9 Mon Sep 17 00:00:00 2001 From: immarvin Date: Wed, 11 Feb 2015 03:12:38 -0800 Subject: [PATCH] add support for online mirrors in pkgdir during provision --- xCAT-server/lib/xcat/plugins/debian.pm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm index 3daa675e9..199e99ca6 100755 --- a/xCAT-server/lib/xcat/plugins/debian.pm +++ b/xCAT-server/lib/xcat/plugins/debian.pm @@ -506,6 +506,8 @@ sub mkinstall my $profile; my $tmplfile; my $pkgdir; + my $pkgdirval; + my @mirrors; my $pkglistfile; my $imagename; # set it if running of 'nodeset osimage=xxx' my $platform; @@ -580,13 +582,23 @@ sub mkinstall $arch = $ph->{osarch}; $profile = $ph->{profile}; $platform=xCAT_plugin::debian::getplatform($os); + + $tmplfile=$ph->{template}; + $pkgdirval=$ph->{pkgdir}; + my @pkgdirlist=split(/,/,$pkgdirval); + foreach (@pkgdirlist){ + if($_ =~ /^http|ssh/){ + push @mirrors,$_; + }else{ + $pkgdir=$_; + } + + } - $tmplfile=$ph->{template}; - $pkgdir=$ph->{pkgdir}; if (!$pkgdir) { $pkgdir="$installroot/$os/$arch"; } - $pkglistfile=$ph->{pkglist}; + $pkglistfile=$ph->{pkglist}; } else { $os = $ent->{os};