summaryrefslogtreecommitdiff
path: root/cloudinit/distros
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-23 16:48:41 -0400
committerScott Moser <smoser@brickies.net>2016-08-23 16:48:41 -0400
commit7b925df28f84c824e9e4697723d879903a81e780 (patch)
tree2314e210f13cc5cc7bdc59971b9f4b657f755825 /cloudinit/distros
parentd0c794919d9a9bf176eb96e25e72836a65e841f1 (diff)
parenta551cb080388c2016bcf23981f99a4a6aa0fe198 (diff)
downloadvyos-cloud-init-7b925df28f84c824e9e4697723d879903a81e780.tar.gz
vyos-cloud-init-7b925df28f84c824e9e4697723d879903a81e780.zip
merge trunk at 0.7.7~bzr1208
Diffstat (limited to 'cloudinit/distros')
-rw-r--r--cloudinit/distros/rhel_util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/distros/rhel_util.py b/cloudinit/distros/rhel_util.py
index 84aad623..903d7793 100644
--- a/cloudinit/distros/rhel_util.py
+++ b/cloudinit/distros/rhel_util.py
@@ -86,4 +86,4 @@ def update_resolve_conf_file(fn, dns_servers, search_servers):
r_conf.add_search_domain(s)
except ValueError:
util.logexc(LOG, "Failed at adding search domain %s", s)
- util.write_file(fn, r_conf, 0o644)
+ util.write_file(fn, str(r_conf), 0o644)