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 | |
| 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')
| -rw-r--r-- | cloudinit/config/cc_mounts.py | 4 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceAzure.py | 7 | ||||
| -rw-r--r-- | cloudinit/util.py | 3 |
3 files changed, 9 insertions, 5 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") diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index dbc2bb68..b802b03e 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -252,7 +252,7 @@ class DataSourceAzureNet(sources.DataSource): cc_modules_override = support_new_ephemeral(self.sys_cfg) if cc_modules_override: - self.cfg['cloud_config_modules'] = cc_modules_override + self.cfg['cloud_init_modules'] = cc_modules_override return True @@ -283,11 +283,14 @@ def find_fabric_formatted_ephemeral_part(): device_location = potential_location break if device_location is None: + LOG.debug("no azure resource disk partition path found") return None ntfs_devices = util.find_devs_with("TYPE=ntfs") real_device = os.path.realpath(device_location) if real_device in ntfs_devices: return device_location + LOG.debug("'%s' existed (%s) but was not ntfs formated", + device_location, real_device) return None @@ -342,7 +345,7 @@ def support_new_ephemeral(cfg): LOG.debug("cloud-init will format ephemeral0.1 this boot.") LOG.debug("setting disk_setup and mounts modules 'always' for this boot") - cc_modules = cfg.get('cloud_config_modules') + cc_modules = cfg.get('cloud_init_modules') if not cc_modules: return None diff --git a/cloudinit/util.py b/cloudinit/util.py index 7c37eb8f..6c5cf741 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -2337,7 +2337,8 @@ def read_dmi_data(key): # running dmidecode can be problematic on some arches (LP: #1243287) uname_arch = os.uname()[4] - if uname_arch.startswith("arm") or uname_arch == "aarch64": + if not (uname_arch == "x86_64" or + (uname_arch.startswith("i") and uname_arch[2:] == "86")): LOG.debug("dmidata is not supported on %s", uname_arch) return None |