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. --- cloudinit/config/cc_mounts.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 0c796b18..5cb2ca8a 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -42,6 +42,14 @@ values. It defaults to:: mount_default_fields: [none, none, "auto", "defaults,nobootwait", "0", "2"] +On a systemd booted system that default is the mostly equivalent:: + + mount_default_fields: [none, none, "auto", + "defaults,nofail,x-systemd.requires=cloud-init.service", "0", "2"] + +Note that `nobootwait` is an upstart specific boot option that somewhat +equates to the more standard `nofail`. + Swap files can be configured by setting the path to the swap file to create with ``filename``, the size of the swap file with ``size`` maximum size of the swap file if using an ``size: auto`` with ``maxsize``. By default no @@ -58,8 +66,8 @@ swap file is created. mounts: - [ /dev/ephemeral0, /mnt, auto, "defaults,noexec" ] - [ sdc, /opt/data ] - - [ xvdh, /opt/data, "auto", "defaults,nobootwait", "0", "0" ] - mount_default_fields: [None, None, "auto", "nefaults,nobootwait", "0", "2"] + - [ xvdh, /opt/data, "auto", "defaults,nofail", "0", "0" ] + mount_default_fields: [None, None, "auto", "defaults,nofail", "0", "2"] swap: filename: size: <"auto"/size in bytes> -- cgit v1.2.3