summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2015-01-16 13:11:06 -0500
committerScott Moser <smoser@ubuntu.com>2015-01-16 13:11:06 -0500
commit64f27180fb349646ed7d073248fe22685df428b4 (patch)
tree57aee9a183dcd1f7429dd25f354c94687e070db1
parenta61ec07ed02d725a004ec17b4ae5257c89d67987 (diff)
parentdf288bf65a436f42509b10b604a1e169c44c49e6 (diff)
downloadvyos-cloud-init-64f27180fb349646ed7d073248fe22685df428b4.tar.gz
vyos-cloud-init-64f27180fb349646ed7d073248fe22685df428b4.zip
systemd: run cloud-init before systemd-user-sessions.service
This fixes a race condition that can cause cloud-init output to be spit out over the login prompt on the console when booting under systemd.
-rw-r--r--ChangeLog1
-rw-r--r--systemd/cloud-init.service2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 400e51f3..da2a5a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
- Update to use newer/better OMNIBUS_URL for chef module
- GCE: Allow base64 encoded user-data (LP: #1404311) [Wayne Witzell III]
- GCE: use short hostname rather than fqdn (LP: #1383794) [Ben Howard]
+ - systemd: make init stage run before login prompts shown [Steve Langasek]
0.7.6:
- open 0.7.6
- Enable vendordata on CloudSigma datasource (LP: #1303986)
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service
index 6b0c7229..398b90ea 100644
--- a/systemd/cloud-init.service
+++ b/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 systemd-user-sessions.service
Requires=network.target
Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service