Merge lp:~darkmuggle-deactivatedaccount/cloud-init/lp1514485 into lp:~cloud-init-dev/cloud-init/trunk

Proposed by Ben Howard on 2015-11-09
Status: Merged
Merged at revision: 1155
Proposed branch: lp:~darkmuggle-deactivatedaccount/cloud-init/lp1514485
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 16 lines (+5/-1)
1 file modified
cloudinit/config/cc_mounts.py (+5/-1)
To merge this branch: bzr merge lp:~darkmuggle-deactivatedaccount/cloud-init/lp1514485
Reviewer Review Type Date Requested Status
Scott Moser 2015-11-09 Pending
Review via email: mp+277067@code.launchpad.net

Description of the change

Correct the handling of "nobootwait" for Ubuntu 15.10 and later.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/config/cc_mounts.py'
2--- cloudinit/config/cc_mounts.py 2015-08-12 16:51:39 +0000
3+++ cloudinit/config/cc_mounts.py 2015-11-09 23:44:37 +0000
4@@ -263,7 +263,11 @@
5
6 def handle(_name, cfg, cloud, log, _args):
7 # fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno
8- defvals = [None, None, "auto", "defaults,nobootwait", "0", "2"]
9+ def_mnt_opts = "defaults,nobootwait"
10+ if cloud.distro.uses_systemd():
11+ def_mnt_opts = "defaults,nofail"
12+
13+ defvals = [None, None, "auto", def_mnt_opts, "0", "2"]
14 defvals = cfg.get("mount_default_fields", defvals)
15
16 # these are our default set of mounts