MAAS

Merge lp:~julian-edwards/maas/preseed-bug-1310082 into lp:~maas-committers/maas/trunk

  1. preseed-bug-1310082
  2. Merge into trunk
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: 2513
Merged at revision: 2513
Proposed branch: lp:~julian-edwards/maas/preseed-bug-1310082
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
contrib/preseeds_v2/generic (+1/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/preseed-bug-1310082
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+225767@code.launchpad.net

Commit message

Fix d-i preseed to work with HWE subarches. Previously the d-i installer would hang on a debconf screen when encountering invalid architectures like "amd64/hwe-s"

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/preseeds_v2/generic'
2--- contrib/preseeds_v2/generic 2014-04-14 22:40:43 +0000
3+++ contrib/preseeds_v2/generic 2014-07-07 04:17:52 +0000
4@@ -2,7 +2,7 @@
5
6 {{def proxy}}
7 d-i mirror/country string manual
8-{{if node.architecture in {'i386/generic', 'amd64/generic'} }}
9+{{if node.split_arch()[0] in {'i386', 'amd64'} }}
10 d-i mirror/http/hostname string {{main_archive_hostname}}
11 d-i mirror/http/directory string {{main_archive_directory}}
12 {{else}}