From 26a577bba298b58f30d649481748ba0e54f59f27 Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@fedoraproject.org>
Date: Thu, 13 Sep 2012 20:13:10 -0700
Subject: [PATCH] Send output to the console

https://bugzilla.redhat.com/show_bug.cgi?id=854654
---
 cloud-init-0.6.3-systemd-stdout.patch | 52 +++++++++++++++++++++++++++
 cloud-init.spec                       |  5 +++
 2 files changed, 57 insertions(+)
 create mode 100644 cloud-init-0.6.3-systemd-stdout.patch

diff --git a/cloud-init-0.6.3-systemd-stdout.patch b/cloud-init-0.6.3-systemd-stdout.patch
new file mode 100644
index 0000000..04b59b3
--- /dev/null
+++ b/cloud-init-0.6.3-systemd-stdout.patch
@@ -0,0 +1,52 @@
+Index: cloud-init-0.6.3-bzr532/systemd/cloud-config.service
+===================================================================
+--- cloud-init-0.6.3-bzr532.orig/systemd/cloud-config.service
++++ cloud-init-0.6.3-bzr532/systemd/cloud-config.service
+@@ -10,5 +10,8 @@ ExecStart=/usr/bin/cloud-init-cfg all co
+ RemainAfterExit=yes
+ TimeoutSec=0
+ 
++# Output needs to appear in instance console output
++StandardOutput=tty
++
+ [Install]
+ WantedBy=multi-user.target
+Index: cloud-init-0.6.3-bzr532/systemd/cloud-final.service
+===================================================================
+--- cloud-init-0.6.3-bzr532.orig/systemd/cloud-final.service
++++ cloud-init-0.6.3-bzr532/systemd/cloud-final.service
+@@ -10,5 +10,8 @@ ExecStart=/usr/bin/cloud-init-cfg all fi
+ RemainAfterExit=yes
+ TimeoutSec=0
+ 
++# Output needs to appear in instance console output
++StandardOutput=tty
++
+ [Install]
+ WantedBy=multi-user.target
+Index: cloud-init-0.6.3-bzr532/systemd/cloud-init-local.service
+===================================================================
+--- cloud-init-0.6.3-bzr532.orig/systemd/cloud-init-local.service
++++ cloud-init-0.6.3-bzr532/systemd/cloud-init-local.service
+@@ -9,5 +9,8 @@ ExecStart=/usr/bin/cloud-init start-loca
+ RemainAfterExit=yes
+ TimeoutSec=0
+ 
++# Output needs to appear in instance console output
++StandardOutput=tty
++
+ [Install]
+ WantedBy=multi-user.target
+Index: cloud-init-0.6.3-bzr532/systemd/cloud-init.service
+===================================================================
+--- cloud-init-0.6.3-bzr532.orig/systemd/cloud-init.service
++++ cloud-init-0.6.3-bzr532/systemd/cloud-init.service
+@@ -10,5 +10,8 @@ ExecStart=/usr/bin/cloud-init start
+ RemainAfterExit=yes
+ TimeoutSec=0
+ 
++# Output needs to appear in instance console output
++StandardOutput=tty
++
+ [Install]
+ WantedBy=multi-user.target
diff --git a/cloud-init.spec b/cloud-init.spec
index 5d9d38b..597adcd 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -27,6 +27,9 @@ Patch4:         cloud-init-0.6.3-fqdn.patch
 # Kill off timeouts for when users' cloud-config jobs take > 90s to finish
 # https://bugzilla.redhat.com/show_bug.cgi?id=836269
 Patch5:         cloud-init-0.6.3-systemd-timeout.patch
+# Send output to console so euca-get-console-output works
+# https://bugzilla.redhat.com/show_bug.cgi?id=854654
+Patch6:         cloud-init-0.6.3-systemd-stdout.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +68,7 @@ ssh keys and to let the user run various scripts.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 cp -p %{SOURCE2} README.fedora
 
@@ -149,6 +153,7 @@ fi
 * Thu Sep 13 2012 Garrett Holmstrom <gholms@fedoraproject.org> - 0.6.3-0.4.bzr532
 - Use a FQDN (instance-data.) for instance data URL fallback [RH:850916 LP:1040200]
 - Shut off systemd timeouts [RH:836269]
+- Send output to the console [RH:854654]
 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.3-0.4.bzr532
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild