Merge lp://qastaging/~lamont/maas/bug-1651452-2.1 into lp://qastaging/maas/2.1
Proposed by
LaMont Jones
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | LaMont Jones | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 5572 | ||||
Proposed branch: | lp://qastaging/~lamont/maas/bug-1651452-2.1 | ||||
Merge into: | lp://qastaging/maas/2.1 | ||||
Diff against target: |
53 lines (+21/-0) 2 files modified
src/provisioningserver/boot/tests/test_uefi_amd64.py (+4/-0) src/provisioningserver/boot/uefi_amd64.py (+17/-0) |
||||
To merge this branch: | bzr merge lp://qastaging/~lamont/maas/bug-1651452-2.1 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
LaMont Jones (community) | Approve | ||
Review via email:
|
Commit message
Backport r5615 from trunk: Properly format kernel command line for UEFI boot parsing.
Description of the change
Fix regression from Bug#1582323 -- UEFI requires those braces to be escaped, while pxeboot requires non-escaped.
To post a comment you must log in.
Trivial backport