Merge lp:~phurley/cloud-init/nocloud-doc into lp:~cloud-init-dev/cloud-init/trunk

Proposed by Peter Hurley
Status: Merged
Merged at revision: 1183
Proposed branch: lp:~phurley/cloud-init/nocloud-doc
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
doc/sources/nocloud/README.rst (+1/-1)
To merge this branch: bzr merge lp:~phurley/cloud-init/nocloud-doc
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+280908@code.launchpad.net

Description of the change

Single commit to document the requirement that the volume label must be 'cidata' for the filesystem to be recognized as a potential NoCloud datasource.

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

merged. thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/sources/nocloud/README.rst'
--- doc/sources/nocloud/README.rst 2013-02-05 07:10:36 +0000
+++ doc/sources/nocloud/README.rst 2015-12-17 19:08:34 +0000
@@ -3,7 +3,7 @@
3having a network at all).3having a network at all).
44
5You can provide meta-data and user-data to a local vm boot via files on a `vfat`_5You can provide meta-data and user-data to a local vm boot via files on a `vfat`_
6or `iso9660`_ filesystem. 6or `iso9660`_ filesystem. The filesystem volume label must be ``cidata``.
77
8These user-data and meta-data files are expected to be8These user-data and meta-data files are expected to be
9in the following format.9in the following format.