diff options
| author | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
|---|---|---|
| committer | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
| commit | 69d6195ec6a37dc7a8f045fc262c74d01624eb56 (patch) | |
| tree | 303ed83b05fdac41604ff3ad7c83c8c8046462eb /cloudinit/CloudConfig/cc_mounts.py | |
| parent | f52ffe2dda01dd0314523fcac559e6f3fbb3578e (diff) | |
| parent | 1d00c0936bfc63117493d89268da8c81611b3c40 (diff) | |
| download | vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.tar.gz vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.zip | |
Merge from trunk.
Diffstat (limited to 'cloudinit/CloudConfig/cc_mounts.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_mounts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/CloudConfig/cc_mounts.py b/cloudinit/CloudConfig/cc_mounts.py index db382f04..a3036d5a 100644 --- a/cloudinit/CloudConfig/cc_mounts.py +++ b/cloudinit/CloudConfig/cc_mounts.py @@ -31,7 +31,7 @@ def is_mdname(name): return True return False -def handle(name,cfg,cloud,log,args): +def handle(_name,cfg,cloud,log,_args): # fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno defvals = [ None, None, "auto", "defaults,nobootwait", "0", "2" ] defvals = cfg.get("mount_default_fields", defvals) @@ -116,7 +116,7 @@ def handle(name,cfg,cloud,log,args): # now, each entry in the cfgmnt list has all fstab values # if the second field is None (not the string, the value) we skip it - actlist = filter(lambda x: x[1] is not None, cfgmnt) + actlist = [x for x in cfgmnt if x[1] is not None] if len(actlist) == 0: return |