← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~racb/maas/arm-preseed into lp:maas

 

Robie Basak has proposed merging lp:~racb/maas/arm-preseed into lp:maas.

Commit message:
Select correct mirror based on node architecture

The node and architecture should always be known now that d-i is only used
for installation (and not enlistment), so this is now safe.


Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~racb/maas/arm-preseed/+merge/125765
-- 
https://code.launchpad.net/~racb/maas/arm-preseed/+merge/125765
Your team MAAS Maintainers is requested to review the proposed merge of lp:~racb/maas/arm-preseed into lp:maas.
=== modified file 'contrib/preseeds_v2/generic'
--- contrib/preseeds_v2/generic	2012-08-07 05:38:45 +0000
+++ contrib/preseeds_v2/generic	2012-09-21 16:40:40 +0000
@@ -1,9 +1,14 @@
 {{inherit "preseed_master"}}
 {{def proxy}}
 d-i     mirror/country string manual
+{{if node.architecture in {'i386', 'amd64'} }}
 d-i     mirror/http/hostname string archive.ubuntu.com
 d-i     mirror/http/directory string /ubuntu
-d-i     mirror/http/proxy string http://{{server_host}}:8000/
+{{else}}
+d-i     mirror/http/hostname string ports.ubuntu.com
+d-i     mirror/http/directory string /ubuntu-ports
+{{endif}}
+d-i     mirror/http/proxy string http://10.193.36.10:3128/
 {{enddef}}
 
 {{def client_packages}}