From 39fb5a0240597112af8162c6c3365288450a7a77 Mon Sep 17 00:00:00 2001 From: Anhad Jai Singh Date: Fri, 9 Dec 2016 19:40:26 +0530 Subject: 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. --- doc/examples/cloud-config-gluster.txt | 4 ++-- doc/examples/cloud-config-mount-points.txt | 8 ++++---- doc/examples/cloud-config.txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'doc/examples') diff --git a/doc/examples/cloud-config-gluster.txt b/doc/examples/cloud-config-gluster.txt index f8183e77..cb979123 100644 --- a/doc/examples/cloud-config-gluster.txt +++ b/doc/examples/cloud-config-gluster.txt @@ -1,6 +1,6 @@ #cloud-config # vim: syntax=yaml -# Mounts volfile exported by glusterfsd running on +# Mounts volfile exported by glusterfsd running on # "volfile-server-hostname" onto the local mount point '/mnt/data' # # In reality, replace 'volfile-server-hostname' with one of your nodes @@ -10,7 +10,7 @@ packages: - glusterfs-client mounts: - - [ 'volfile-server-hostname:6996', /mnt/data, glusterfs, "defaults,nobootwait", "0", "2" ] + - [ 'volfile-server-hostname:6996', /mnt/data, glusterfs, "defaults,nofail", "0", "2" ] runcmd: - [ modprobe, fuse ] 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 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. -- cgit v1.2.3