Merge lp:~rvb/maas/bug-restart-1397567 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: 3494
Proposed branch: lp:~rvb/maas/bug-restart-1397567
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 10 lines (+1/-1)
1 file modified
etc/maas/templates/power/amt.template (+1/-1)
To merge this branch: bzr merge lp:~rvb/maas/bug-restart-1397567
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+248003@code.launchpad.net

Commit message

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).

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/maas/templates/power/amt.template'
2--- etc/maas/templates/power/amt.template 2014-10-14 09:28:15 +0000
3+++ etc/maas/templates/power/amt.template 2015-01-29 16:13:55 +0000
4@@ -93,7 +93,7 @@
5
6 # Power-cycle the machine, and boot it using the requested boot mode.
7 restart() {
8- issue_amt_command powercycle "$amt_boot_mode"
9+ yes | issue_amt_command powercycle "$amt_boot_mode"
10 }
11
12