diff options
| author | Ben Howard <ben.howard@canonical.com> | 2014-02-07 10:10:02 +0200 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2014-02-07 10:10:02 +0200 |
| commit | 3087da32ec5cf84c51e0ebdd80a71a84b174a392 (patch) | |
| tree | 1918a08395e97dbd84bbf43c65c5740bf4ee3365 /cloudinit/sources/DataSourceConfigDrive.py | |
| parent | 4fe439b9e137e0b59d00e919dc16aea9da35082a (diff) | |
| parent | 3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff) | |
| download | vyos-cloud-init-3087da32ec5cf84c51e0ebdd80a71a84b174a392.tar.gz vyos-cloud-init-3087da32ec5cf84c51e0ebdd80a71a84b174a392.zip | |
Rebase on upstream
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 |