diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-02-07 15:14:26 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-02-07 15:14:26 -0800 |
| commit | 2983a26ecf9716dc957ec4bacf15544072774190 (patch) | |
| tree | a7e074c21789ebc553713b3fd591fd9bbe4a9684 /cloudinit/sources/DataSourceConfigDrive.py | |
| parent | 810df2c55c108e7e4064263e508d9786d8b1dc8e (diff) | |
| parent | 3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff) | |
| download | vyos-cloud-init-2983a26ecf9716dc957ec4bacf15544072774190.tar.gz vyos-cloud-init-2983a26ecf9716dc957ec4bacf15544072774190.zip | |
Remerged with trunk
Diffstat (limited to 'cloudinit/sources/DataSourceConfigDrive.py')
| -rw-r--r-- | cloudinit/sources/DataSourceConfigDrive.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index c45a1119..1d30fe08 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -246,10 +246,13 @@ def find_candidate_devs(probe_optical=True): # combine list of items by putting by-label items first # followed by fstype items, but with dupes removed - combined = (by_label + [d for d in by_fstype if d not in by_label]) + candidates = (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 - return [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 (ex sda, not sda1) + devices = [d for d in candidates + if d in by_label or not util.is_partition(d)] + return devices # Used to match classes to dependencies |