diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-06-17 11:13:16 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-06-17 11:13:16 -0400 |
| commit | 971b5878c2699b2b48d7ab7a5e6983d90df4ce84 (patch) | |
| tree | a1562fa8e9083e0a2d1ca2e3b502ce5bac06c6e0 /doc | |
| parent | 03804622f0fa6963ddfe9fa9292b28653665365a (diff) | |
| download | vyos-cloud-init-971b5878c2699b2b48d7ab7a5e6983d90df4ce84.tar.gz vyos-cloud-init-971b5878c2699b2b48d7ab7a5e6983d90df4ce84.zip | |
make the default "fill in" mount entries configurable. (LP: #785542)
The primary motivation for this is so that 'nobootwait' is not hard
coded to appear in the fs_opts field.
LP: #785542
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/cloud-config.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt index eaedabeb..edf58067 100644 --- a/doc/examples/cloud-config.txt +++ b/doc/examples/cloud-config.txt @@ -111,7 +111,7 @@ packages: # written to /etc/fstab. # - '/dev' can be ommitted for device names that begin with: xvd, sd, hd, vd # - if an entry does not have all 6 fields, they will be filled in -# from the following: [ None, None, "auto", "defaults,nobootwait", "0", "2" ] +# with values from 'mount_default_fields' below. # # Note, that you should set 'nobootwait' (see man fstab) for volumes that may # not be attached at instance boot (or reboot) @@ -122,6 +122,11 @@ mounts: - [ xvdh, /opt/data, "auto", "defaults,nobootwait", "0", "0" ] - [ dd, /dev/zero ] +# mount_default_fields +# These values are used to fill in any entries in 'mounts' that are not +# complete. This must be an array, and must have 7 fields. +mount_default_fields: [ None, None, "auto", "defaults,nobootwait", "0", "2" ] + # add each entry to ~/.ssh/authorized_keys for the configured user ssh_authorized_keys: - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoUPND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ mykey@host |