rpms/cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity

Send output to the console

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=854654
This commit is contained in:
Garrett Holmstrom 2012-09-13 20:13:10 -07:00
parent 1e6bbb98d7
commit 26a577bba2
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
cloud-init-0.6.3-systemd-stdout.patch Normal file
View File

@ -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

5
cloud-init.spec
View File

@ -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 # Kill off timeouts for when users' cloud-config jobs take > 90s to finish
# https://bugzilla.redhat.com/show_bug.cgi?id=836269 # https://bugzilla.redhat.com/show_bug.cgi?id=836269
Patch5: cloud-init-0.6.3-systemd-timeout.patch 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 BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
cp -p %{SOURCE2} README.fedora 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 * 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] - Use a FQDN (instance-data.) for instance data URL fallback [RH:850916 LP:1040200]
- Shut off systemd timeouts [RH:836269] - 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 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild