diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-07-09 15:34:51 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-07-09 15:34:51 -0600 |
| commit | 92002fb7a2f41314d6aba74646644e5fdd5c39a0 (patch) | |
| tree | 05a6aedccd30b88a80d8f8f1187b75c9bb6444c6 /doc | |
| parent | bea500a37d64ef62ecd7edb8c6cb4634336ad60c (diff) | |
| parent | 2e62cb8a6406309cbeb5f8d2aa00fb30e72e1cfc (diff) | |
| download | vyos-cloud-init-92002fb7a2f41314d6aba74646644e5fdd5c39a0.tar.gz vyos-cloud-init-92002fb7a2f41314d6aba74646644e5fdd5c39a0.zip | |
merge from master at 18.3-9-g2e62cb8a
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/cloud-config-run-cmds.txt | 5 | ||||
| -rw-r--r-- | doc/examples/cloud-config.txt | 5 | ||||
| -rw-r--r-- | doc/rtd/topics/format.rst | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/doc/examples/cloud-config-run-cmds.txt b/doc/examples/cloud-config-run-cmds.txt index 3bb06864..002398f5 100644 --- a/doc/examples/cloud-config-run-cmds.txt +++ b/doc/examples/cloud-config-run-cmds.txt @@ -18,5 +18,8 @@ runcmd: - [ sh, -xc, "echo $(date) ': hello world!'" ] - [ sh, -c, echo "=========hello world'=========" ] - ls -l /root - - [ wget, "http://slashdot.org", -O, /tmp/index.html ] + # Note: Don't write files to /tmp from cloud-init use /run/somedir instead. + # Early boot environments can race systemd-tmpfiles-clean LP: #1707222. + - mkdir /run/mydir + - [ wget, "http://slashdot.org", -O, /run/mydir/index.html ] diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt index bd84c641..774f66b9 100644 --- a/doc/examples/cloud-config.txt +++ b/doc/examples/cloud-config.txt @@ -127,7 +127,10 @@ runcmd: - [ sh, -xc, "echo $(date) ': hello world!'" ] - [ sh, -c, echo "=========hello world'=========" ] - ls -l /root - - [ wget, "http://slashdot.org", -O, /tmp/index.html ] + # Note: Don't write files to /tmp from cloud-init use /run/somedir instead. + # Early boot environments can race systemd-tmpfiles-clean LP: #1707222. + - mkdir /run/mydir + - [ wget, "http://slashdot.org", -O, /run/mydir/index.html ] # boot commands diff --git a/doc/rtd/topics/format.rst b/doc/rtd/topics/format.rst index e25289ad..1b0ff366 100644 --- a/doc/rtd/topics/format.rst +++ b/doc/rtd/topics/format.rst @@ -121,7 +121,7 @@ Cloud Boothook This content is ``boothook`` data. It is stored in a file under ``/var/lib/cloud`` and then executed immediately. This is the earliest ``hook`` available. Note, that there is no mechanism provided for running only once. The boothook must take care of this itself. -It is provided with the instance id in the environment variable ``INSTANCE_I``. This could be made use of to provide a 'once-per-instance' type of functionality. +It is provided with the instance id in the environment variable ``INSTANCE_ID``. This could be made use of to provide a 'once-per-instance' type of functionality. Begins with: ``#cloud-boothook`` or ``Content-Type: text/cloud-boothook`` when using a MIME archive. |