summaryrefslogtreecommitdiff
path: root/cloudinit/sources
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-03-01 16:03:02 -0500
committerScott Moser <smoser@ubuntu.com>2013-03-01 16:03:02 -0500
commitac83536339d2622f4a896f50681497a388e7e26f (patch)
treeb1eb9d55e624f20700fad208284ac079abc4d20a /cloudinit/sources
parente71071a9bea85235c708380473d8cf3912f7aa61 (diff)
downloadvyos-cloud-init-ac83536339d2622f4a896f50681497a388e7e26f.tar.gz
vyos-cloud-init-ac83536339d2622f4a896f50681497a388e7e26f.zip
fix regression on expected label of filesystem for DataSourceNone
Last addition to DataSourceNoCloud left it looking for a filesystem named 'None'.
Diffstat (limited to 'cloudinit/sources')
-rw-r--r--cloudinit/sources/DataSourceNoCloud.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py
index 097bbc52..603f0155 100644
--- a/cloudinit/sources/DataSourceNoCloud.py
+++ b/cloudinit/sources/DataSourceNoCloud.py
@@ -86,11 +86,11 @@ class DataSourceNoCloud(sources.DataSource):
if 'ds_config' not in found:
found.append("ds_config")
- if self.ds_cfg.get('fs_label', "cidata"):
+ label = self.ds_cfg.get('fs_label', "cidata")
+ if label is not None:
fslist = util.find_devs_with("TYPE=vfat")
fslist.extend(util.find_devs_with("TYPE=iso9660"))
- label = self.ds_cfg.get('fs_label')
label_list = util.find_devs_with("LABEL=%s" % label)
devlist = list(set(fslist) & set(label_list))
devlist.sort(reverse=True)