diff -Nru cloud-init-0.7.7~bzr1149/debian/changelog cloud-init-0.7.7~bzr1149/debian/changelog
--- cloud-init-0.7.7~bzr1149/debian/changelog	2015-11-05 12:41:40.000000000 -0700
+++ cloud-init-0.7.7~bzr1149/debian/changelog	2015-11-09 18:00:51.000000000 -0700
@@ -1,3 +1,13 @@
+cloud-init (0.7.7~bzr1149-0ubuntu4) wily; urgency=medium
+
+  * Fix cloud-init managed mounts using old nobootwait mount option
+    (LP: #1514485).
+    - d/patches/lp-1514485-nofail_for_ephemeral_mounts.patch: Use nofail
+      mount option in fstab instead of bootwait
+    - d/cloud-init.postinst: correct nobootwait if configured by cloud-init
+
+ -- Ben Howard <ben.howard@ubuntu.com>  Mon, 09 Nov 2015 13:30:14 -0700
+
 cloud-init (0.7.7~bzr1149-0ubuntu3) wily; urgency=medium
 
   * d/patches/lp-1177432-same-archives-as-ubuntu-server.patch: use the
diff -Nru cloud-init-0.7.7~bzr1149/debian/cloud-init.postinst cloud-init-0.7.7~bzr1149/debian/cloud-init.postinst
--- cloud-init-0.7.7~bzr1149/debian/cloud-init.postinst	2015-09-22 07:48:05.000000000 -0600
+++ cloud-init-0.7.7~bzr1149/debian/cloud-init.postinst	2015-11-09 17:44:00.000000000 -0700
@@ -193,6 +193,23 @@
 
 }
 
+fix_1514485() {
+  ### Begin fix for LP: 1514485
+  # Due to a change in systemd, "nobootwait" != "nofail". This preserves
+  # the intention of cloud-init configured devices
+
+  if grep nobootwait /etc/fstab > /dev/null 2>&1; then
+     cloud-init single --name mounts --frequency=always >/dev/null 2>&1 || cat <<EOM
+Warning: failed to reconfigure mounts in /etc/fstab. Please check"
+         to make sure that nobootwait is changed to nofail.
+         See https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1514485
+         for more information.
+EOM
+  fi
+
+  ### End fix for LP: 1514485
+}
+
 if [ "$1" = "configure" ]; then
    # disable ureadahead (LP: #499520)
    dpkg-divert --package cloud-init --rename --divert \
@@ -233,6 +250,8 @@
    # fix issue where cloud-init misidentifies the location of grub
    fix_1336855
 
+   # fix change in systemd where nobootwait != nofail
+   fix_1514485
 fi
 
 #DEBHELPER#
diff -Nru cloud-init-0.7.7~bzr1149/debian/patches/lp-1514485-nofail_for_ephemeral_mounts.patch cloud-init-0.7.7~bzr1149/debian/patches/lp-1514485-nofail_for_ephemeral_mounts.patch
--- cloud-init-0.7.7~bzr1149/debian/patches/lp-1514485-nofail_for_ephemeral_mounts.patch	1969-12-31 17:00:00.000000000 -0700
+++ cloud-init-0.7.7~bzr1149/debian/patches/lp-1514485-nofail_for_ephemeral_mounts.patch	2015-11-09 13:56:15.000000000 -0700
@@ -0,0 +1,15 @@
+--- a/cloudinit/config/cc_mounts.py
++++ b/cloudinit/config/cc_mounts.py
+@@ -263,7 +263,11 @@
+ 
+ def handle(_name, cfg, cloud, log, _args):
+     # fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno
+-    defvals = [None, None, "auto", "defaults,nobootwait", "0", "2"]
++    def_mnt_opts = "defaults,nobootwait"
++    if cloud.distro.uses_systemd():
++        def_mnt_opts = "defaults,nofail"
++
++    defvals = [None, None, "auto", def_mnt_opts, "0", "2"]
+     defvals = cfg.get("mount_default_fields", defvals)
+ 
+     # these are our default set of mounts
diff -Nru cloud-init-0.7.7~bzr1149/debian/patches/series cloud-init-0.7.7~bzr1149/debian/patches/series
--- cloud-init-0.7.7~bzr1149/debian/patches/series	2015-11-05 12:42:17.000000000 -0700
+++ cloud-init-0.7.7~bzr1149/debian/patches/series	2015-11-09 13:30:14.000000000 -0700
@@ -1 +1,2 @@
 lp-1177432-same-archives-as-ubuntu-server.patch
+lp-1514485-nofail_for_ephemeral_mounts.patch