Merge pull request #76 from marineam/units2

fix(units): Relax ordering requirements for now.
Merge pull request #66 from bcwaldon/doc-encoding
2014-04-15 15:19:13 -07:00 · 2014-04-15 10:06:14 -07:00 · 2014-04-14 21:39:40 -04:00 · 2014-04-08 08:34:39 -07:00
2 changed files with 5 additions and 2 deletions
--- a/Documentation/cloud-config.md
+++ b/Documentation/cloud-config.md
@@ -263,6 +263,9 @@ Provide a list of objects with the following attributes:
 - **permissions**: String representing file permissions in octal notation (i.e. '0644')
 - **owner**: User and group that should own the file written to disk. This is equivalent to the `<user>:<group>` argument to `chown <user>:<group> <path>`.
 Explicitly not implemented is the **encoding** attribute.
 The **content** field must represent exactly what should be written to disk.
 ### manage_etc_hosts
 Have coreos-cloudinit manage your /etc/hosts file for local name resolution.
--- a/units/user-cloudinit@.service
+++ b/units/user-cloudinit@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Load cloud-config from %f
-Requires=system-config.target
+Requires=coreos-setup-environment.service
-After=system-config.target
+After=coreos-setup-environment.service
 Before=user-config.target
 ConditionFileNotEmpty=%f
Author	SHA1	Message	Date
Michael Marineau	13a3d892ca	Merge pull request #76 from marineam/units2 fix(units): Relax ordering requirements for now.	2014-04-15 15:19:13 -07:00
Brian Waldon	2e237ebead	Merge pull request #66 from bcwaldon/doc-encoding doc(write_files): Explicitly document lack of encoding support	2014-04-15 10:06:14 -07:00
Michael Marineau	78d8be8427	fix(units): Relax ordering requirements for now. The current cloudinit implementation blocks when starting units which causes it to deadlock the boot process if a system cloud config starts a user cloud config because the user configs want to run after system is done. Until cloudinit switches to non-blocking calls user configs will go back to just depending on coreos-setup-environment.service.	2014-04-14 21:39:40 -04:00
Brian Waldon	19f8fe49af	doc(write_files): Explicitly document lack of encoding support	2014-04-08 08:34:39 -07:00