x/cloud-init
Code Issues Proposed changes

DataSourceOVF: only search for OVF data on ISO9660 filesystems

Browse Source 
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.
This commit is contained in:
Scott Moser
2012-02-15 16:03:37 -05:00
parent 032f4abb1f
commit 690c753321
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -23,6 +23,7 @@
- in ci-info lines, use '.' to indicate empty field for easier machine reading - in ci-info lines, use '.' to indicate empty field for easier machine reading
- support empty lines in "#include" files (LP: #923043) - support empty lines in "#include" files (LP: #923043)
- support configuration of salt minions (Jeff Bauer) (LP: #927795) - support configuration of salt minions (Jeff Bauer) (LP: #927795)
- DataSourceOVF: only search for OVF data on ISO9660 filesystems (LP: #898373)
0.6.2: 0.6.2:
- fix bug where update was not done unless update was explicitly set. - 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 It would not be run if 'upgrade' or packages were set to be installed

2
cloudinit/DataSourceOVF.py
View File

@@ -162,7 +162,7 @@ def get_ovf_env(dirname):
# transport functions take no input and return # transport functions take no input and return
# a 3 tuple of content, path, filename # a 3 tuple of content, path, filename
def transport_iso9660(require_iso=False): def transport_iso9660(require_iso=True):
# default_regex matches values in # default_regex matches values in
# /lib/udev/rules.d/60-cdrom_id.rules # /lib/udev/rules.d/60-cdrom_id.rules