diff options
| author | Scott Moser <smoser@brickies.net> | 2016-09-20 13:58:52 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-09-20 13:58:52 -0400 |
| commit | 539ad73ee6c4a7d48e5ca4c58b329fcc0216f929 (patch) | |
| tree | 955a9007cc7f62f2983aeb487959d3c7b061ca9f /cloudinit/config/cc_mounts.py | |
| parent | b6c724db8ee7fcf5cd2f95aa3909d2108a8f3c10 (diff) | |
| parent | 80f5ec4be0f781b26eca51d90d51abfab396b3f6 (diff) | |
| download | vyos-cloud-init-539ad73ee6c4a7d48e5ca4c58b329fcc0216f929.tar.gz vyos-cloud-init-539ad73ee6c4a7d48e5ca4c58b329fcc0216f929.zip | |
merge from master at 0.7.8-3-g80f5ec4
Diffstat (limited to 'cloudinit/config/cc_mounts.py')
| -rw-r--r-- | cloudinit/config/cc_mounts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 2b981935..4084118b 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -265,7 +265,7 @@ def handle(_name, cfg, cloud, log, _args): # fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno def_mnt_opts = "defaults,nobootwait" if cloud.distro.uses_systemd(): - def_mnt_opts = "defaults,nofail" + def_mnt_opts = "defaults,nofail,x-systemd.requires=cloud-init.service" defvals = [None, None, "auto", def_mnt_opts, "0", "2"] defvals = cfg.get("mount_default_fields", defvals) @@ -401,5 +401,5 @@ def handle(_name, cfg, cloud, log, _args): try: util.subp(("mount", "-a")) - except Exception: + except util.ProcessExecutionError: util.logexc(log, "Activating mounts via 'mount -a' failed") |