diff options
| author | Greg Padgett <gpadgett@redhat.com> | 2013-04-10 12:19:37 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-04-10 12:19:37 -0400 |
| commit | b9c6f197b6865987e9cdd2cd71fa1a5a9dff11c5 (patch) | |
| tree | 05953e7b1d262fb783068209cffb9fd4a76080ce /cloudinit/sources/DataSourceConfigDrive.py | |
| parent | 1c2adfa3835e031a0f946cef0d99fcfe3dfc1c95 (diff) | |
| parent | 984c72e522c585c6d3f6b3d3aec39fb21dd84028 (diff) | |
| download | vyos-cloud-init-b9c6f197b6865987e9cdd2cd71fa1a5a9dff11c5.tar.gz vyos-cloud-init-b9c6f197b6865987e9cdd2cd71fa1a5a9dff11c5.zip | |
improvments to systemd/fedora 18 support
This branch contains fixes found while investigating integration of cloud-init
into oVirt. They're in 3 categories:
- compatibility with systemd configuration management (as used in Fedora 18)
- workaround for a 2.6 kernel quirk which prevented 'blkid' from displaying
/dev/sr0 in some cases
- writing sysconfig files in typical convention, with a newline preceding EOF,
to make some parsers happy
Diffstat (limited to 'cloudinit/sources/DataSourceConfigDrive.py')
| -rw-r--r-- | cloudinit/sources/DataSourceConfigDrive.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index 5f152299..d3443c2b 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -258,6 +258,9 @@ def find_candidate_devs(): * labeled with 'config-2' """ + # Query optical drive to get it in blkid cache for 2.6 kernels + util.find_devs_with(path="/dev/sr0") + by_fstype = (util.find_devs_with("TYPE=vfat") + util.find_devs_with("TYPE=iso9660")) by_label = util.find_devs_with("LABEL=config-2") |