Commit 0e0e590b authored by Scott Moser's avatar Scott Moser

cc_mounts: use 'nofail' if system uses systemd. (LP: #1514485)

'nofail' is the systemd equivalent of the mountall/upstart 'nobootwait'.
So, if a system uses systemd, then use 'nofail' in /etc/fstab for
ephemeral mounts.
parents 74fe2d2c f1db8eaa
......@@ -67,6 +67,7 @@
- AltCloud: fix call to udevadm settle (LP: #1507526)
- Ubuntu templates: modify sources.list template to provide same sources
as install from server or desktop ISO. (LP: #1177432)
- cc_mounts: use 'nofail' if system uses systemd. (LP: #1514485)
- open 0.7.6
- Enable vendordata on CloudSigma datasource (LP: #1303986)
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment