Merge lp:~julian-edwards/maas/say-bug-1172966 into lp:maas/trunk

Proposed by Julian Edwards on 2013-04-26
Status: Merged
Approved by: Julian Edwards on 2013-04-26
Approved revision: 1470
Merged at revision: 1470
Proposed branch: lp:~julian-edwards/maas/say-bug-1172966
Merge into: lp:maas/trunk
Diff against target: 9 lines (+0/-1)
1 file modified
src/provisioningserver/pxe/config.local.template (+0/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/say-bug-1172966
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve on 2013-04-26
Review via email: mp+161062@code.launchpad.net

Commit message

Remove the SAY in pxe templates as it can break ARM.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/pxe/config.local.template'
2--- src/provisioningserver/pxe/config.local.template 2012-08-17 11:12:09 +0000
3+++ src/provisioningserver/pxe/config.local.template 2013-04-26 03:55:32 +0000
4@@ -1,5 +1,4 @@
5 DEFAULT local
6
7 LABEL local
8- SAY Booting local disk ...
9 LOCALBOOT 0