diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-01-16 19:46:30 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-01-16 19:46:30 -0500 |
| commit | e561742aeab1e8090467f0fa304ee06e82e85f2c (patch) | |
| tree | 8ab8cc494cbd2929b95f2563a6d78940999521f8 /cloudinit/sources | |
| parent | 0c38be4ae18e08640269e2f45e9243ea4867153c (diff) | |
| download | vyos-cloud-init-e561742aeab1e8090467f0fa304ee06e82e85f2c.tar.gz vyos-cloud-init-e561742aeab1e8090467f0fa304ee06e82e85f2c.zip | |
DataSourceConfigDrive: consider CD rom as valid config-drive source.
previously, there was an attempt in the config drive source to limit
the source device to a "full block device" rather than a partition.
This was done by a simplistic approach of checking that the last
character of the name was not a number. That was filtering out
CD-rom devices (sr0).
Now, we have a bit more sophisticated approach to that same problem.
We filter out block devices that have a 'partition' entry in
/sys/class/block/DEVICE_NAME/partition .
LP: #1100545
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceConfigDrive.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index c7826851..ec016a1d 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -270,7 +270,7 @@ def find_candidate_devs(): combined = (by_label + [d for d in by_fstype if d not in by_label]) # We are looking for block device (sda, not sda1), ignore partitions - combined = [d for d in combined if d[-1] not in "0123456789"] + combined = [d for d in combined if not util.is_partition(d)] return combined |