diff options
author | Anhad Jai Singh <ajaisingh@tower-research.com> | 2016-12-09 19:40:26 +0530 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2016-12-19 14:23:27 -0500 |
commit | 39fb5a0240597112af8162c6c3365288450a7a77 (patch) | |
tree | 770ec8f5ec9187c516cd537454c9f6892756af90 /doc/examples/cloud-config.txt | |
parent | 1b6d1624005321ecada077f58bd0948f28f58820 (diff) | |
download | vyos-cloud-init-39fb5a0240597112af8162c6c3365288450a7a77.tar.gz vyos-cloud-init-39fb5a0240597112af8162c6c3365288450a7a77.zip |
doc: change 'nobootwait' to 'nofail' in docs
'nobootwait' is an upstart specific extension to the mount syntax that is
not supported by other mount systems. As Ubuntu 16.04 moved from upstart
to systemd, support for 'nobootwait' was lost.
All examples using 'nobootwait' are updated to use the standard 'nofail',
which gives the expected behaviour of not failing to boot in case a volume
is missing. There are subtle differences in semantics between
'nobootwait' and 'nofail', but it is the best substitute that gives
behaviour similar to the upstart specific option.
Diffstat (limited to 'doc/examples/cloud-config.txt')
-rw-r--r-- | doc/examples/cloud-config.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt index 190029e4..c5f84b13 100644 --- a/doc/examples/cloud-config.txt +++ b/doc/examples/cloud-config.txt @@ -46,19 +46,19 @@ packages: # - if an entry does not have all 6 fields, they will be filled in # with values from 'mount_default_fields' below. # -# Note, that you should set 'nobootwait' (see man fstab) for volumes that may +# Note, that you should set 'nofail' (see man fstab) for volumes that may # not be attached at instance boot (or reboot) # mounts: - [ ephemeral0, /mnt, auto, "defaults,noexec" ] - [ sdc, /opt/data ] - - [ xvdh, /opt/data, "auto", "defaults,nobootwait", "0", "0" ] + - [ xvdh, /opt/data, "auto", "defaults,nofail", "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" ] +mount_default_fields: [ None, None, "auto", "defaults,nofail", "0", "2" ] # add each entry to ~/.ssh/authorized_keys for the configured user or the # first user defined in the user definition directive. |