Import version 0.7.5-0ubuntu1.2ubuntu/0.7.5-0ubuntu1.2

Imported using git-import-dsc

3 files changed, 49 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 8f40cbed..9339440d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cloud-init (0.7.5-0ubuntu1.2) trusty-proposed; urgency=medium
+
+  * d/patches/lp-1353008-cloud-init-local-needs-run.conf:
+    backport change to cloud-init-local.conf to depend on /run being
+    mounted (LP: #1353008)
+
+ -- Scott Moser <smoser@ubuntu.com>  Wed, 17 Sep 2014 09:15:54 -0400
+
 cloud-init (0.7.5-0ubuntu1.1) trusty-proposed; urgency=medium
 
   [ Ben Howard ]
diff --git a/debian/patches/lp-1353008-cloud-init-local-needs-run.conf b/debian/patches/lp-1353008-cloud-init-local-needs-run.conf
new file mode 100644
index 00000000..fcb744e4
--- /dev/null
+++ b/debian/patches/lp-1353008-cloud-init-local-needs-run.conf
@@ -0,0 +1,40 @@
+Author: Scott Moser <smoser@ubuntu.com>
+Bug: https://launchpad.net/bugs/1353008
+Applied-Upstream: yes revno 1012
+Description: cloud-init-local depends on /run. reflect that in upstart job.
+ With the writing of cloud-init status, cloud-init-local needs to
+ have /run mounted.  The issue we were seeing was a race where:
+  cloud-init-local creates /run/cloud-init
+  /run is mounted
+  cloud-init-local tries to link a file into /run/cloud-init
+ .
+ that directory was no longer visisable as /run was mounted over
+ the top.
+ .
+ This also fixes a bug that would occur if a local datasource
+ ran and found a source before cloud-init-nonet ran and networking
+ had not yet come up.  If that occurred then cloud-init-nonet would
+ exit without blocking network.
+--- a/upstart/cloud-init-local.conf
++++ b/upstart/cloud-init-local.conf
+@@ -1,6 +1,6 @@
+ # cloud-init - the initial cloud-init job
+ #   crawls metadata service, emits cloud-config
+-start on mounted MOUNTPOINT=/
++start on mounted MOUNTPOINT=/ and mounted MOUNTPOINT=/run
+ 
+ task
+ 
+--- a/upstart/cloud-init-nonet.conf
++++ b/upstart/cloud-init-nonet.conf
+@@ -58,10 +58,6 @@ script
+    # static_network_up already occurred
+    static_network_up && exit 0
+ 
+-   # obj.pkl comes from cloud-init-local (or previous boot and
+-   # manual_cache_clean)
+-   [ -f /var/lib/cloud/instance/obj.pkl ] && exit 0
+-
+    dowait 10
+    dowait 120
+    msg "gave up waiting for a network device."
diff --git a/debian/patches/series b/debian/patches/series
index 9c43ebc0..f31db0cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 lp1316475-1303986-cloudsigma.patch
+lp-1353008-cloud-init-local-needs-run.conf