diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-01 16:07:37 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-01 16:07:37 -0500 |
| commit | fa98a23c5d5d1e62cdd7dc8dfa68a06104a611e4 (patch) | |
| tree | 55970ef7fc4f2f765d2c92cc52accac3ed968baa | |
| parent | ff0a34876dc0ce29b762ffd7fcdbfa80308e5aae (diff) | |
| parent | ac83536339d2622f4a896f50681497a388e7e26f (diff) | |
| download | vyos-cloud-init-fa98a23c5d5d1e62cdd7dc8dfa68a06104a611e4.tar.gz vyos-cloud-init-fa98a23c5d5d1e62cdd7dc8dfa68a06104a611e4.zip | |
merge from trunk
| -rw-r--r-- | cloudinit/sources/DataSourceNoCloud.py | 4 |
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) |