Merge pull request #23554 from jleroy/debian-hostname-fix

Debian: Hostname always updated
This commit is contained in:
Justin Findlay 2015-05-11 15:57:00 -06:00
commit 755bed0abd

View file

@ -1808,7 +1808,8 @@ def build_network_settings(**settings):
# Write hostname to /etc/hostname
sline = opts['hostname'].split('.', 1)
hostname = '{0}\n' . format(sline[0])
opts['hostname'] = sline[0]
hostname = '{0}\n' . format(opts['hostname'])
current_domainname = current_network_settings['domainname']
# Only write the hostname if it has changed