diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-01-23 15:17:17 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-01-23 15:17:17 -0500 |
| commit | 573ee6d9d641356374ac616f53cb254d4da7c9db (patch) | |
| tree | e96228256276875c47c5031160bd2f3cbe3b5398 /cloudinit/sources/DataSourceConfigDrive.py | |
| parent | 1781668dd65737a800c2c8fdbb79c6f1288d3ef2 (diff) | |
| parent | c833a84f08019ba4413937f2f1b1f12a4ffe5632 (diff) | |
| download | vyos-cloud-init-573ee6d9d641356374ac616f53cb254d4da7c9db.tar.gz vyos-cloud-init-573ee6d9d641356374ac616f53cb254d4da7c9db.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/sources/DataSourceConfigDrive.py')
| -rw-r--r-- | cloudinit/sources/DataSourceConfigDrive.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index 4f437244..2a244496 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -284,8 +284,10 @@ def find_candidate_devs(): # followed by fstype items, but with dupes removed 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 not util.is_partition(d)] + # We are looking for a block device or partition with necessary label or + # an unpartitioned block device. + combined = [d for d in combined + if d in by_label or not util.is_partition(d)] return combined |