diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-18 16:50:06 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-18 16:50:06 -0500 |
| commit | 053e93bc843199becf7b87aef334baa0da28878f (patch) | |
| tree | ad4526c556b8923de5a7b6e2fc1e000a4ba20672 /cloudinit/config | |
| parent | dd133325bffc8942c02bf4e7c77f54396cbd3a49 (diff) | |
| parent | 9e904bbc3336b96475bfd00fb3bf1262ae4de49f (diff) | |
| download | vyos-cloud-init-053e93bc843199becf7b87aef334baa0da28878f.tar.gz vyos-cloud-init-053e93bc843199becf7b87aef334baa0da28878f.zip | |
merge from master at 0.7.8-49-g9e904bb
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_mounts.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index dfc4b598..452c9e83 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -312,7 +312,8 @@ def handle_swapcfg(swapcfg): 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(): + uses_systemd = cloud.distro.uses_systemd() + if uses_systemd: def_mnt_opts = "defaults,nofail,x-systemd.requires=cloud-init.service" defvals = [None, None, "auto", def_mnt_opts, "0", "2"] @@ -447,7 +448,12 @@ def handle(_name, cfg, cloud, log, _args): except Exception: util.logexc(log, "Failed to make '%s' config-mount", d) + activate_cmd = ["mount", "-a"] + if uses_systemd: + activate_cmd = ["systemctl", "daemon-reload"] + fmt = "Activate mounts: %s:" + ' '.join(activate_cmd) try: - util.subp(("mount", "-a")) + util.subp(activate_cmd) + LOG.debug(fmt, "PASS") except util.ProcessExecutionError: - util.logexc(log, "Activating mounts via 'mount -a' failed") + util.logexc(log, fmt, "FAIL") |