diff options
Diffstat (limited to 'cloudinit/distros/debian.py')
| -rw-r--r-- | cloudinit/distros/debian.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index 0d5cbac7..b6e7654f 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -80,9 +80,12 @@ class Distro(distros.Distro): else: return distros.Distro._bring_up_interfaces(self, device_names) - def set_hostname(self, hostname): - self._write_hostname(hostname, self.hostname_conf_fn) - self._apply_hostname(hostname) + def _select_hostname(self, hostname, fqdn): + # Prefer the short hostname over the long + # fully qualified domain name + if not hostname: + return fqdn + return hostname def _write_hostname(self, your_hostname, out_fn): conf = self._read_hostname_conf(out_fn) @@ -128,10 +131,10 @@ class Distro(distros.Distro): if not os.path.isfile(tz_file): raise RuntimeError(("Invalid timezone %s," " no file found at %s") % (tz, tz_file)) - # "" provides trailing newline during join + # Note: "" provides trailing newline during join tz_lines = [ util.make_header(), - str(tz), + str(tz), "", ] util.write_file(self.tz_conf_fn, "\n".join(tz_lines)) |