summaryrefslogtreecommitdiff
path: root/cloudinit/distros/arch.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-06-15 23:28:51 -0400
committerScott Moser <smoser@ubuntu.com>2016-06-15 23:28:51 -0400
commita066f95c67bb5fa15350cdff319f60d589274c3a (patch)
tree790d277e08dd39da82dd956c89709e17538a1a82 /cloudinit/distros/arch.py
parenta454a6408b3c7ecc816073049d060632191099bb (diff)
parentd598ceeb838b4ccaf667ded84bb02bf096ab7b12 (diff)
downloadvyos-cloud-init-a066f95c67bb5fa15350cdff319f60d589274c3a.tar.gz
vyos-cloud-init-a066f95c67bb5fa15350cdff319f60d589274c3a.zip
merge with trunk
Diffstat (limited to 'cloudinit/distros/arch.py')
-rw-r--r--cloudinit/distros/arch.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py
index 93a2e008..66209f22 100644
--- a/cloudinit/distros/arch.py
+++ b/cloudinit/distros/arch.py
@@ -196,6 +196,6 @@ def convert_resolv_conf(settings):
"""Returns a settings string formatted for resolv.conf."""
result = ''
if isinstance(settings, list):
- for ns in list:
+ for ns in settings:
result = result + 'nameserver %s\n' % ns
- return result
+ return result