Merge lp:~rvb/maas/comm-templ-bug-1410367 into lp:~maas-committers/maas/trunk
Proposed by
Raphaël Badin
Status: | Merged |
---|---|
Approved by: | Raphaël Badin |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3477 |
Proposed branch: | lp:~rvb/maas/comm-templ-bug-1410367 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
257 lines (+119/-34) 8 files modified
etc/maas/templates/pxe/config.commissioning.template (+5/-16) etc/maas/templates/pxe/config.enlist.template (+19/-0) etc/maas/templates/pxe/config.xinstall.template (+5/-16) etc/maas/templates/uefi/config.enlist.template (+8/-0) src/maasserver/api/pxeconfig.py (+10/-1) src/maasserver/api/tests/test_pxeconfig.py (+6/-0) src/provisioningserver/boot/tests/test_pxe.py (+29/-1) src/provisioningserver/boot/tests/test_uefi.py (+37/-0) |
To merge this branch: | bzr merge lp:~rvb/maas/comm-templ-bug-1410367 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+246569@code.launchpad.net |
Commit message
In the commissioning and the xinstall templates, ditch the architecture auto-detection and use what's provided in the boot parameters.
Description of the change
It's not entirely clear to me why we were using ifcpu64.c32 in the first place (it's been like that since inception) so I'm putting this up for review to get feedback.
I've tested this on my NUCs but I'm planning to do some additional testing once the CI is green again.
To post a comment you must log in.
Looks good.
The ifcpu64 should only exists in the enlist template so the correct architecture is loaded for the kernel and initramfs. I guess it just happened to get copied into the commissioning script, its amazing it has been like this for this long.