From 8d453d2a4da4492857a4487b14fe7b11a014115b Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 16 Jan 2015 14:29:48 -0500 Subject: hostname: apply hostname same as is written on RHEL, we were writing to persistent configuration the fqdn, but invoking 'hostname' on the first boot with just the shortname. On 'reboot', then the hostname would differ. Now, whatever we write, invoke hostname with. Also remove some duplicate code. LP: #1246485 --- cloudinit/distros/freebsd.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'cloudinit/distros/freebsd.py') diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py index 9216510e..f1b4a256 100644 --- a/cloudinit/distros/freebsd.py +++ b/cloudinit/distros/freebsd.py @@ -150,11 +150,6 @@ class Distro(distros.Distro): return default return hostname - def _select_hostname(self, hostname, fqdn): - if not hostname: - return fqdn - return hostname - def _write_hostname(self, hostname, filename): self.updatercconf('hostname', hostname) -- cgit v1.2.3