summaryrefslogtreecommitdiff
path: root/doc/examples/cloud-config-mount-points.txt
diff options
context:
space:
mode:
authorAnhad Jai Singh <ajaisingh@tower-research.com>2016-12-09 19:40:26 +0530
committerScott Moser <smoser@brickies.net>2016-12-19 14:23:27 -0500
commit39fb5a0240597112af8162c6c3365288450a7a77 (patch)
tree770ec8f5ec9187c516cd537454c9f6892756af90 /doc/examples/cloud-config-mount-points.txt
parent1b6d1624005321ecada077f58bd0948f28f58820 (diff)
downloadvyos-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-mount-points.txt')
-rw-r--r--doc/examples/cloud-config-mount-points.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/examples/cloud-config-mount-points.txt b/doc/examples/cloud-config-mount-points.txt
index aa676c24..5a6c24f5 100644
--- a/doc/examples/cloud-config-mount-points.txt
+++ b/doc/examples/cloud-config-mount-points.txt
@@ -23,19 +23,19 @@
# - 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
-# not be attached at instance boot (or reboot)
+# 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" ]
# swap can also be set up by the 'mounts' module