diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-04 15:13:15 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-04 15:13:15 -0500 |
| commit | c1625a5f90d4f08b193e4fcfc3238bb32bcf61df (patch) | |
| tree | 5032f10e7380ee998cebba1c90bca2db7cb3e339 /cloudinit/sources | |
| parent | 7bb938c0a677637796ee62fc4242d8c0118987bd (diff) | |
| parent | 2a64b4e7a702933ec5e5a726155cc7acbe4d8144 (diff) | |
| download | vyos-cloud-init-c1625a5f90d4f08b193e4fcfc3238bb32bcf61df.tar.gz vyos-cloud-init-c1625a5f90d4f08b193e4fcfc3238bb32bcf61df.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/sources')
| -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) |