diff options
| author | Petr Spacek <pspacek@redhat.com> | 2014-01-14 10:48:31 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-01-16 17:04:40 +0100 |
| commit | 79fa07341156eddab7466f2780a45de959f42368 (patch) | |
| tree | 6f729920c47e4f0136040a410b265f76b5e4762f /ipaserver | |
| parent | 088fbad35323146429df4a79a976022753c3b28f (diff) | |
| download | freeipa.git-79fa07341156eddab7466f2780a45de959f42368.tar.gz freeipa.git-79fa07341156eddab7466f2780a45de959f42368.tar.xz freeipa.git-79fa07341156eddab7466f2780a45de959f42368.zip | |
Treat error during write to /etc/resolv.conf as non-fatal.
https://fedorahosted.org/freeipa/ticket/4110
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 4baeb4e0..beeb39de 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -823,11 +823,14 @@ class BindInstance(service.Service): def __setup_resolv_conf(self): self.fstore.backup_file(RESOLV_CONF) resolv_txt = "search "+self.domain+"\nnameserver "+self.ip_address+"\n" - resolv_fd = open(RESOLV_CONF, 'w') - resolv_fd.seek(0) - resolv_fd.truncate(0) - resolv_fd.write(resolv_txt) - resolv_fd.close() + try: + resolv_fd = open(RESOLV_CONF, 'w') + resolv_fd.seek(0) + resolv_fd.truncate(0) + resolv_fd.write(resolv_txt) + resolv_fd.close() + except IOError as e: + root_logger.error('Could not write to resolv.conf: %s', e) def add_master_dns_records(self, fqdn, ip_address, realm_name, domain_name, reverse_zone, ntp=False, ca_configured=None): |