From f1db8eaa68dadaae6a591339f69994e3afb589c3 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 9 Nov 2015 16:40:43 -0700 Subject: With Ubuntu 15.10, "nobootwait" != "nofail". The "nobootwait" was an Ubuntu specific option. This change was dropped in 15.10 (LP: #1514485). --- cloudinit/config/cc_mounts.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cloudinit/config') 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 -- cgit v1.2.3