diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-02-15 16:03:37 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-02-15 16:03:37 -0500 |
| commit | 4213f7c28c2b6788938b1504e5dec7fcda2b8806 (patch) | |
| tree | e1d72002d8f900dd5ae0eb3b74f35e9c6608108b | |
| parent | fcefeb469261bf19ffa249ceddf1ca003e520e5d (diff) | |
| download | vyos-cloud-init-4213f7c28c2b6788938b1504e5dec7fcda2b8806.tar.gz vyos-cloud-init-4213f7c28c2b6788938b1504e5dec7fcda2b8806.zip | |
DataSourceOVF: only search for OVF data on ISO9660 filesystems
I believe this will resolve LP: #898373 by making DataSourceOVF restrict
its mounting of filesystems to iso9660. By doing this, it will never
mount a ext3 (or btrfs or any fs that mountall would fsck) and thus will
avoid any races with that.
LP: #898373
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/DataSourceOVF.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -23,6 +23,7 @@ - in ci-info lines, use '.' to indicate empty field for easier machine reading - support empty lines in "#include" files (LP: #923043) - support configuration of salt minions (Jeff Bauer) (LP: #927795) + - DataSourceOVF: only search for OVF data on ISO9660 filesystems (LP: #898373) 0.6.2: - fix bug where update was not done unless update was explicitly set. It would not be run if 'upgrade' or packages were set to be installed diff --git a/cloudinit/DataSourceOVF.py b/cloudinit/DataSourceOVF.py index 1f2b622e..a0b1b518 100644 --- a/cloudinit/DataSourceOVF.py +++ b/cloudinit/DataSourceOVF.py @@ -162,7 +162,7 @@ def get_ovf_env(dirname): # transport functions take no input and return # a 3 tuple of content, path, filename -def transport_iso9660(require_iso=False): +def transport_iso9660(require_iso=True): # default_regex matches values in # /lib/udev/rules.d/60-cdrom_id.rules |