diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2015-03-18 13:33:12 +0000 |
|---|---|---|
| committer | Daniel Watkins <daniel.watkins@canonical.com> | 2015-03-18 13:33:12 +0000 |
| commit | 0b9e0444f5092e647a3fa55887d96ffaf3d23c06 (patch) | |
| tree | 5fbbae7d5d0ef42b1365e7556949dd37db4c9d2c /cloudinit/config | |
| parent | e298037a04284370d30faa7a1808e985be3a4cc4 (diff) | |
| download | vyos-cloud-init-0b9e0444f5092e647a3fa55887d96ffaf3d23c06.tar.gz vyos-cloud-init-0b9e0444f5092e647a3fa55887d96ffaf3d23c06.zip | |
Update is_disk_used for changed enumerate_disk output.
Fixes Launchpad bug #1311463.
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_disk_setup.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py index f899210b..e2ce6db4 100644 --- a/cloudinit/config/cc_disk_setup.py +++ b/cloudinit/config/cc_disk_setup.py @@ -304,8 +304,7 @@ def is_disk_used(device): # If the child count is higher 1, then there are child nodes # such as partition or device mapper nodes - use_count = [x for x in enumerate_disk(device)] - if len(use_count.splitlines()) > 1: + if len(list(enumerate_disk(device))) > 1: return True # If we see a file system, then its used |