[lxc-devel] [PATCH] oracle template: use url arg to wget repo file

[Stéphane Graber]

On 01/08/2013 12:01 PM, Serge Hallyn wrote:
> Quoting Dwight Engen (dwight.engen at oracle.com):
>> Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
> 
> Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

Pushed to staging.

>> ---
>>  templates/lxc-oracle.in | 10 +++++++---
>>  1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/templates/lxc-oracle.in b/templates/lxc-oracle.in
>> index 6a64a33..4ccec9f 100644
>> --- a/templates/lxc-oracle.in
>> +++ b/templates/lxc-oracle.in
>> @@ -397,7 +397,11 @@ container_rootfs_create()
>>          echo "Downloading release $container_release_major.$container_release_minor for $basearch"
>>  
>>          # get yum repo file
>> -        public_yum_url=http://public-yum.oracle.com
>> +        if [ -n "$repourl" ]; then
>> +            yum_url=$repourl
>> +        else
>> +            yum_url=http://public-yum.oracle.com
>> +        fi
>>          if   [ $container_release_major = "5" ]; then
>>              repofile=public-yum-el5.repo
>>          elif [ $container_release_major = "6" ]; then
>> @@ -406,9 +410,9 @@ container_rootfs_create()
>>              die "Unsupported release $container_release_major"
>>          fi
>>          mkdir -p $container_rootfs/etc/yum.repos.d
>> -        wget -q $public_yum_url/$repofile -O $container_rootfs/etc/yum.repos.d/$repofile
>> +        wget -q $yum_url/$repofile -O $container_rootfs/etc/yum.repos.d/$repofile
>>          if [ $? -ne 0 ]; then
>> -            die "Failed to download repo file $public_yum_url/$repofile"
>> +            die "Failed to download repo file $yum_url/$repofile"
>>          fi
>>  
>>          # yum will take $basearch from host, so force the arch we want
>> -- 
>> 1.7.11.7
>>
>>
>> ------------------------------------------------------------------------------
>> Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
>> MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
>> with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
>> MVPs and experts. SALE $99.99 this month only -- learn more at:
>> http://p.sf.net/sfu/learnmore_122412
>> _______________________________________________
>> Lxc-devel mailing list
>> Lxc-devel at lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/lxc-devel
> 
> ------------------------------------------------------------------------------
> Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS
> and more. Get SQL Server skills now (including 2012) with LearnDevNow -
> 200+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
> SALE $99.99 this month only - learn more at:
> http://p.sf.net/sfu/learnmore_122512
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel
> 


-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 901 bytes
Desc: OpenPGP digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20130108/ef4de830/attachment.pgp>