From 1005c29b6b914d9fa837f4015d4ab31b186e5b89 Mon Sep 17 00:00:00 2001
From: Jake Moshenko <jake.moshenko@coreos.com>
Date: Tue, 23 Dec 2014 17:08:16 -0500
Subject: [PATCH] Fix the shutdown command for when the builder terminates
 itself.

---
 buildman/templates/cloudconfig.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildman/templates/cloudconfig.yaml b/buildman/templates/cloudconfig.yaml
index fc8ec6a4f..321e75927 100644
--- a/buildman/templates/cloudconfig.yaml
+++ b/buildman/templates/cloudconfig.yaml
@@ -31,8 +31,8 @@ coreos:
         [Service]
         TimeoutStartSec=600
         TimeoutStopSec=2000
-        ExecStartPre=/usr/bin/sudo /bin/sh -xc "echo '{{ manager_ip }} buildman.quay.io' >> /etc/hosts; exit 0"
+        ExecStartPre=/bin/sh -xc "echo '{{ manager_ip }} buildman.quay.io' >> /etc/hosts; exit 0"
         ExecStartPre=/usr/bin/docker login -u {{ quay_username }} -p {{ quay_password }} -e unused quay.io
         ExecStart=/usr/bin/docker run --rm --net=host --name quay-builder --privileged --env-file /root/overrides.list -v /var/run/docker.sock:/var/run/docker.sock quay.io/coreos/registry-build-worker:latest
         ExecStop=/usr/bin/docker stop quay-builder
-        ExecStopPost=/usr/bin/sudo /bin/sh -xc "/bin/sleep 600; /sbin/shutdown -h now"
+        ExecStopPost=/bin/sh -xc "/bin/sleep 600; /usr/bin/systemctl --no-block poweroff"