diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:37 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:37 -0400 |
| commit | a0acfa6110775da4f694c1d081ae5da567351b4b (patch) | |
| tree | 0b3a9e74f85a2cd675ec407d110616c7a4493f2e /cloudinit | |
| parent | 7b0efb97c3667d4d1335e384433877a13e065380 (diff) | |
| parent | 0e0e590b60ad3f5d1ef66ef7f7df271c4bc09c7f (diff) | |
| download | vyos-cloud-init-a0acfa6110775da4f694c1d081ae5da567351b4b.tar.gz vyos-cloud-init-a0acfa6110775da4f694c1d081ae5da567351b4b.zip | |
merge trunk at 0.7.7~bzr1155
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/config/cc_mounts.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 47b63dfc..11089d8d 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -263,7 +263,11 @@ def handle_swapcfg(swapcfg): def handle(_name, cfg, cloud, log, _args): # fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno - defvals = [None, None, "auto", "defaults,nobootwait", "0", "2"] + def_mnt_opts = "defaults,nobootwait" + if cloud.distro.uses_systemd(): + def_mnt_opts = "defaults,nofail" + + defvals = [None, None, "auto", def_mnt_opts, "0", "2"] defvals = cfg.get("mount_default_fields", defvals) # these are our default set of mounts |