diff options
| author | Anhad Jai Singh <ajaisingh@tower-research.com> | 2016-12-09 19:40:26 +0530 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-12-19 14:23:27 -0500 |
| commit | 39fb5a0240597112af8162c6c3365288450a7a77 (patch) | |
| tree | 770ec8f5ec9187c516cd537454c9f6892756af90 /tests/data/merge_sources | |
| parent | 1b6d1624005321ecada077f58bd0948f28f58820 (diff) | |
| download | vyos-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 'tests/data/merge_sources')
| -rw-r--r-- | tests/data/merge_sources/expected8.yaml | 2 | ||||
| -rw-r--r-- | tests/data/merge_sources/source8-1.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
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 ] |