MAAS

Merge lp:~rvb/maas/bug-restart-1397567-1.7 into lp:maas/1.7

  1. bug-restart-1397567-1.7
  2. Merge into 1.7
Proposed by Raphaël Badin
Status: Merged
Approved by: Raphaël Badin
Approved revision: no longer in the source branch.
Merged at revision: 3342
Proposed branch: lp:~rvb/maas/bug-restart-1397567-1.7
Merge into: lp:maas/1.7
Diff against target: 23 lines (+2/-2)
2 files modified
docs/changelog.rst (+1/-1)
etc/maas/templates/power/amt.template (+1/-1)
To merge this branch: bzr merge lp:~rvb/maas/bug-restart-1397567-1.7
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+248028@code.launchpad.net

Commit message

Backport revision 3494: Fix call to amttool when restarting a node (there is no '--assume-yes' option for amttool so use the same trick used elsewhere in the template). Backport 3459: Fix bad bug link in changelog.

Description of the change

The backport of 3459 is just a drive-by backport: it only affects the changelog.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Simple backport, self-approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/changelog.rst'
2--- docs/changelog.rst 2015-01-23 17:55:04 +0000
3+++ docs/changelog.rst 2015-01-29 17:19:42 +0000
4@@ -345,7 +345,7 @@
5 `1381619`_)
6
7 .. _1381619:
8- https://launchpad.net/bugs/_1381619
9+ https://launchpad.net/bugs/1381619
10
11 **AMT power control**
12 A few AMT-related issues remain, with workarounds:
13
14=== modified file 'etc/maas/templates/power/amt.template'
15--- etc/maas/templates/power/amt.template 2014-10-14 09:28:15 +0000
16+++ etc/maas/templates/power/amt.template 2015-01-29 17:19:42 +0000
17@@ -93,7 +93,7 @@
18
19 # Power-cycle the machine, and boot it using the requested boot mode.
20 restart() {
21- issue_amt_command powercycle "$amt_boot_mode"
22+ yes | issue_amt_command powercycle "$amt_boot_mode"
23 }
24
25

Subscribers

People subscribed via source and target branches

to all changes: