diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-05-01 05:44:55 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-05-01 05:44:55 -0400 |
| commit | e232b4ce895be7c96a90bc92774248531ee0e6be (patch) | |
| tree | fe3b49b7a1d4adfb2910f1bc4db924d909060493 /cloudinit | |
| parent | 96854d720d4bd356181acfa093744599a807ea8e (diff) | |
| parent | 0b9e0444f5092e647a3fa55887d96ffaf3d23c06 (diff) | |
| download | vyos-cloud-init-e232b4ce895be7c96a90bc92774248531ee0e6be.tar.gz vyos-cloud-init-e232b4ce895be7c96a90bc92774248531ee0e6be.zip | |
Update is_disk_used for changed enumerate_disk output.
LP: #1311463
Diffstat (limited to 'cloudinit')
| -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 |