Merge Hostname fix.

This commit is contained in:
Nick Daly 2013-11-10 16:34:31 -06:00
commit a9c6b17624

View File

@ -49,9 +49,13 @@ def get_hostname():
def set_hostname(hostname):
"Sets machine hostname to hostname"
# Hostname should be ASCII. If it's unicode but passed our valid_hostname check, convert to ASCII.
hostname = str(hostname)
cfg.log.info("Changing hostname to '%s'" % hostname)
try:
privilegedaction_run("hostname-change", [hostname])
privilegedaction_run("hostname-change", hostname)
# don't persist/cache change unless it was saved successfuly
sys_store = filedict_con(cfg.store_file, 'sys')
sys_store['hostname'] = hostname