summaryrefslogtreecommitdiff
path: root/doc/examples
diff options
context:
space:
mode:
authorPaul Meyer <paulmey@microsoft.com>2017-05-02 22:26:50 +0000
committerScott Moser <smoser@ubuntu.com>2017-05-03 21:57:56 -0400
commit4f0f171c29bb9abb5cbb6f9adbe68015089aeed9 (patch)
treec7b219d49280dcdd03477a7d533658baa2adfee9 /doc/examples
parent99faf3ece1badc566e7e75e769ff374250196197 (diff)
downloadvyos-cloud-init-4f0f171c29bb9abb5cbb6f9adbe68015089aeed9.tar.gz
vyos-cloud-init-4f0f171c29bb9abb5cbb6f9adbe68015089aeed9.zip
fs_setup: if cmd is specified, use shell interpretation.
If 'cmd' is provided to a fs_setup entry, then cloud-init was trying to execute the rendered string as a single name, rather than splitting the string. The change here will pass the string to shell for interpretation so that it is split there. Also fix some documentation errors and warn when fs_opts or overwrite is provided along with 'cmd'. LP: #1687712
Diffstat (limited to 'doc/examples')
-rw-r--r--doc/examples/cloud-config-disk-setup.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/examples/cloud-config-disk-setup.txt b/doc/examples/cloud-config-disk-setup.txt
index 3e46a22e..38ad0528 100644
--- a/doc/examples/cloud-config-disk-setup.txt
+++ b/doc/examples/cloud-config-disk-setup.txt
@@ -155,11 +155,11 @@ fs_setup:
filesystem: 'ext3'
device: 'ephemeral0'
partition: 'auto'
- - label: mylabl2
+ - label: mylabl2
filesystem: 'ext4'
device: '/dev/xvda1'
- - special:
- cmd: mkfs -t %(FILESYSTEM)s -L %(LABEL)s %(DEVICE)s
+ - cmd: mkfs -t %(filesystem)s -L %(label)s %(device)s
+ label: mylabl3
filesystem: 'btrfs'
device: '/dev/xvdh'