summaryrefslogtreecommitdiff
path: root/doc/examples/cloud-config-mount-points.txt
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-01-20 10:06:55 -0500
committerScott Moser <smoser@brickies.net>2017-01-20 10:06:55 -0500
commitd00b7dba8767618ae360f56bf64b7ab7a8c49d2e (patch)
tree349799f76c39669a03a6acbd48502970c0abb994 /doc/examples/cloud-config-mount-points.txt
parentfa3009b64949fef3744ddb940f01477dfa2d25e5 (diff)
parent7fb6f78177b5ece10ca7c54ba3958010a9987f06 (diff)
downloadvyos-cloud-init-d00b7dba8767618ae360f56bf64b7ab7a8c49d2e.tar.gz
vyos-cloud-init-d00b7dba8767618ae360f56bf64b7ab7a8c49d2e.zip
merge from 0.7.9 at 0.7.9
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