summaryrefslogtreecommitdiff
path: root/cloudinit/distros/arch.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-06-15 22:54:29 -0400
committerScott Moser <smoser@ubuntu.com>2016-06-15 22:54:29 -0400
commitcfbf95f531f4e637fc707478e4ebbb5af39db355 (patch)
tree48b7bf1d110b4f4b35a8833ea83d0c9c54775268 /cloudinit/distros/arch.py
parent14271e89f3a2a6a813fc5aac7163da3defcfd4c1 (diff)
parentd4b587ebf500ddc2259fffc94a3c69c199c9a427 (diff)
downloadvyos-cloud-init-cfbf95f531f4e637fc707478e4ebbb5af39db355.tar.gz
vyos-cloud-init-cfbf95f531f4e637fc707478e4ebbb5af39db355.zip
merge from 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