Merge lp:~thomnico/orange-box/AMT-template-fix into lp:orange-box

[Nicolas Thomas]

[lp:~thomnico/orange-box/AMT-template-fix]

516. By Darryl Weaver on 2014-11-01

Nicolas Thomas 2014-10-31 Adding applying the tested AMT template change associated with it

=== modified file 'usr/bin/orange-box-apm-power-fix'
--- usr/bin/orange-box-apm-power-fix	2014-10-25 00:14:02 +0000
+++ usr/bin/orange-box-apm-power-fix	2014-10-31 09:27:20 +0000
@@ -19,11 +19,20 @@
 
 set -x
 
+if [ ! -f  /var/lib/maas/boot-resources/current/syslinux/poweroff-APM.com ]
+then
 cd /srv/data
 wget https://launchpadlibrarian.net/187530745/acpioff.c32
 cd /var/lib/maas/boot-resources/current/syslinux
 sudo mv poweroff.com poweroff-APM.com
 sudo mv /srv/data/acpioff.c32 poweroff.c32
+fi
+
+#fixing the AMT template 
+cd /srv/data
+wget https://launchpadlibrarian.net/187911231/not-permitted.patch
+cd /etc/maas/templates/power
+patch < /srv/data/not-permitted.patch
 
 exit