cloud-init

Merge lp:~mfisch/cloud-init/doc-fixes into lp:~cloud-init-dev/cloud-init/trunk

  1. doc-fixes
  2. Merge into trunk
Proposed by Matt Fischer on 2016-05-17
Status: Merged
Merged at revision: 1218
Proposed branch: lp:~mfisch/cloud-init/doc-fixes
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 35 lines (+5/-4)
2 files modified
doc/examples/cloud-config-boot-cmds.txt (+3/-3)
doc/examples/cloud-config-run-cmds.txt (+2/-1)
To merge this branch: bzr merge lp:~mfisch/cloud-init/doc-fixes
Reviewer Review Type Date Requested Status
Scott Moser 2016-05-17 Approve on 2016-05-18
Review via email: mp+294976@code.launchpad.net

Description of the Change

minor doc fixes

To post a comment you must log in.
David Medberry (med) wrote :

not sure how to vote, +1?

Scott Moser (smoser) wrote :

this looks fine. i'll pull it soon.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/examples/cloud-config-boot-cmds.txt'
2--- doc/examples/cloud-config-boot-cmds.txt 2013-01-25 02:41:26 +0000
3+++ doc/examples/cloud-config-boot-cmds.txt 2016-05-17 21:07:25 +0000
4@@ -7,9 +7,9 @@
5 # bootcmd should really only be used for things that could not be
6 # done later in the boot process. bootcmd is very much like
7 # boothook, but possibly with more friendly.
8-# * bootcmd will run on every boot
9-# * the INSTANCE_ID variable will be set to the current instance id.
10-# * you can use 'cloud-init-boot-per' command to help only run once
11+# - bootcmd will run on every boot
12+# - the INSTANCE_ID variable will be set to the current instance id.
13+# - you can use 'cloud-init-boot-per' command to help only run once
14 bootcmd:
15 - echo 192.168.1.130 us.archive.ubuntu.com > /etc/hosts
16 - [ cloud-init-per, once, mymkfs, mkfs, /dev/vdb ]
17
18=== modified file 'doc/examples/cloud-config-run-cmds.txt'
19--- doc/examples/cloud-config-run-cmds.txt 2013-01-25 02:41:26 +0000
20+++ doc/examples/cloud-config-run-cmds.txt 2016-05-17 21:07:25 +0000
21@@ -5,12 +5,13 @@
22 # runcmd contains a list of either lists or a string
23 # each item will be executed in order at rc.local like level with
24 # output to the console
25+# - runcmd only runs during the first boot
26 # - if the item is a list, the items will be properly executed as if
27 # passed to execve(3) (with the first arg as the command).
28 # - if the item is a string, it will be simply written to the file and
29 # will be interpreted by 'sh'
30 #
31-# Note, that the list has to be proper yaml, so you have to escape
32+# Note, that the list has to be proper yaml, so you have to quote
33 # any characters yaml would eat (':' can be problematic)
34 runcmd:
35 - [ ls, -l, / ]