[cloud-init/f16: 6/7] Shut off systemd timeouts

[gholms]

commit 1e6bbb98d76c996c628c4f4527f50510855e49a3
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Thu Sep 13 19:52:44 2012 -0700

    Shut off systemd timeouts
    
    https://bugzilla.redhat.com/show_bug.cgi?id=836269

 cloud-init-0.6.3-systemd-timeout.patch |   48 ++++++++++++++++++++++++++++++++
 cloud-init.spec                        |    5 +++
 2 files changed, 53 insertions(+), 0 deletions(-)
---
diff --git a/cloud-init-0.6.3-systemd-timeout.patch b/cloud-init-0.6.3-systemd-timeout.patch
new file mode 100644
index 0000000..723e748
--- /dev/null
+++ b/cloud-init-0.6.3-systemd-timeout.patch
@@ -0,0 +1,48 @@
+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
+@@ -8,6 +8,7 @@ Wants=network.target
+ Type=oneshot
+ ExecStart=/usr/bin/cloud-init-cfg all config
+ RemainAfterExit=yes
++TimeoutSec=0
+ 
+ [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
+@@ -8,6 +8,7 @@ Wants=network.target
+ Type=oneshot
+ ExecStart=/usr/bin/cloud-init-cfg all final
+ RemainAfterExit=yes
++TimeoutSec=0
+ 
+ [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
+@@ -7,6 +7,7 @@ After=local-fs.target
+ Type=oneshot
+ ExecStart=/usr/bin/cloud-init start-local
+ RemainAfterExit=yes
++TimeoutSec=0
+ 
+ [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
+@@ -8,6 +8,7 @@ Wants=local-fs.target cloud-init-local.s
+ Type=oneshot
+ ExecStart=/usr/bin/cloud-init start
+ RemainAfterExit=yes
++TimeoutSec=0
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/cloud-init.spec b/cloud-init.spec
index 95c2a9f..5d9d38b 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -24,6 +24,9 @@ Patch3:         cloud-init-0.6.3-yum.patch
 # https://bugs.launchpad.net/cloud-init/+bug/1040200
 # http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/revision/635
 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
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +64,7 @@ ssh keys and to let the user run various scripts.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 cp -p %{SOURCE2} README.fedora
 
@@ -144,6 +148,7 @@ fi
 %changelog
 * Thu Sep 13 2012 Garrett Holmstrom <gholms at 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]
 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-0.4.bzr532
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild