diff -Nru cloud-init-0.7.7~snappy~bzr1045/debian/changelog cloud-init-0.7.7~snappy~bzr1045/debian/changelog --- cloud-init-0.7.7~snappy~bzr1045/debian/changelog 2015-01-07 13:32:39.000000000 +0000 +++ cloud-init-0.7.7~snappy~bzr1045/debian/changelog 2015-01-15 18:20:46.000000000 +0000 @@ -1,3 +1,11 @@ +cloud-init (0.7.7~snappy~bzr1045-0ubuntu3) vivid; urgency=medium + + * Ensure that when running under systemd, cloud-init.service is run before + we display any getty on the console so that the cloud-init output + doesn't get written on top of a login prompt. + + -- Steve Langasek Thu, 15 Jan 2015 10:20:45 -0800 + cloud-init (0.7.7~snappy~bzr1045-0ubuntu2) vivid; urgency=low * add XB-Task: ubuntu-core header diff -Nru cloud-init-0.7.7~snappy~bzr1045/debian/patches/series cloud-init-0.7.7~snappy~bzr1045/debian/patches/series --- cloud-init-0.7.7~snappy~bzr1045/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ cloud-init-0.7.7~snappy~bzr1045/debian/patches/series 2015-01-15 18:45:45.000000000 +0000 @@ -0,0 +1 @@ +systemd-boot-order diff -Nru cloud-init-0.7.7~snappy~bzr1045/debian/patches/systemd-boot-order cloud-init-0.7.7~snappy~bzr1045/debian/patches/systemd-boot-order --- cloud-init-0.7.7~snappy~bzr1045/debian/patches/systemd-boot-order 1970-01-01 00:00:00.000000000 +0000 +++ cloud-init-0.7.7~snappy~bzr1045/debian/patches/systemd-boot-order 2015-01-15 18:46:13.000000000 +0000 @@ -0,0 +1,17 @@ +Description: fix unit start order under systemd + Ensure that when running under systemd, cloud-init.service is run before + we display any getty on the console so that the cloud-init output + doesn't get written on top of a login prompt. +Author: Steve Langasek + +--- cloud-init-0.7.7~snappy~bzr1045.orig/systemd/cloud-init.service ++++ cloud-init-0.7.7~snappy~bzr1045/systemd/cloud-init.service +@@ -1,7 +1,7 @@ + [Unit] + Description=Initial cloud-init job (metadata service crawler) + After=local-fs.target network.target cloud-init-local.service +-Before=sshd.service sshd-keygen.service ++Before=sshd.service sshd-keygen.service getty.target + Requires=network.target + Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service +