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. --- tests/data/merge_sources/expected8.yaml | 2 +- tests/data/merge_sources/source8-1.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/data') diff --git a/tests/data/merge_sources/expected8.yaml b/tests/data/merge_sources/expected8.yaml index 69ca562d..360e38f0 100644 --- a/tests/data/merge_sources/expected8.yaml +++ b/tests/data/merge_sources/expected8.yaml @@ -3,5 +3,5 @@ mounts: - [ ephemeral22, /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 ] diff --git a/tests/data/merge_sources/source8-1.yaml b/tests/data/merge_sources/source8-1.yaml index 5ea51c2c..1ac1b0dd 100644 --- a/tests/data/merge_sources/source8-1.yaml +++ b/tests/data/merge_sources/source8-1.yaml @@ -3,5 +3,5 @@ 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 ] -- cgit v1.2.3