Merge lp:~rodsmith/maas-cert-server/fix-i386-detection into lp:~hardware-certification/maas-cert-server/trunk
Status: | Merged |
---|---|
Approved by: | Jeff Lane |
Approved revision: | 67 |
Merged at revision: | 68 |
Proposed branch: | lp:~rodsmith/maas-cert-server/fix-i386-detection |
Merge into: | lp:~hardware-certification/maas-cert-server/trunk |
Diff against target: |
71 lines (+37/-2) 2 files modified
debian/changelog (+7/-0) usr/sbin/maniacs-setup (+30/-2) |
To merge this branch: | bzr merge lp:~rodsmith/maas-cert-server/fix-i386-detection |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeff Lane | Approve | ||
Review via email: mp+311087@code.launchpad.net |
Description of the change
This is not-quite-a-fix for bug #1641971 (using maniacs-setup fails to import i386 images by default under MAAS 2.1, resulting in error messages). Instead of addressing the issue head-on, this version returns the script to the behavior it had in the past (with MAAS 2.0): It imports i386 custom images if and only if standard MAAS i386 images already exist on the server. The error messages seem to be a result of pxelinux being split out into its own unique image in MAAS 2.1, which was not the case with MAAS 2.0. This results in the need for a more complex test to see if an i386 image is loaded. Note that, because this doesn't precisely address the issues in bug #1641971, I have not marked this as a fix for that bug.
Cool.