From 83be006e288c58a46f5b76c29b6886c1f417d88c Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Wed, 15 Mar 2017 10:19:34 +0100 Subject: Import patches-unapplied version 2.2.6-0ubuntu1 to ubuntu/zesty-proposed Imported using git-ubuntu import. Changelog parent: d064ab0bffd429382ea4fafeb144784d403848bd New changelog entries: * New upstream release (LP: #1661750). * debian/control: - Change the maintainer to Ubuntu Developers (LP: #1657528). - Add the dependency of isc-dhcp-client as our maintainer scripts assume it's installed. - Add trailing commas to dependencies, add whitespaces. * Rename ephemeral-disk-warning.sh to ephemeral-disk-warning (lintian error). * debian/docs: - Remove LICENSE.txt as it's redundant. * debian/postinst: - Stop checking for update-initramfs existence using the absolute path, use the 'command' command instead to make lintian happy. * Remove debian/patches/disable-auto-update.patch: - We now ship with auto-updates enabled (LP: #1650522). * debian/maintscript: - Add a maintscript to rename the old logrotate file on upgrade from an ancient version of walinuxagent (LP: #1673152). --- azurelinuxagent/ga/env.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'azurelinuxagent/ga/env.py') diff --git a/azurelinuxagent/ga/env.py b/azurelinuxagent/ga/env.py index 5d8da5c..c81eed7 100644 --- a/azurelinuxagent/ga/env.py +++ b/azurelinuxagent/ga/env.py @@ -56,9 +56,9 @@ class EnvHandler(object): self.stopped = False logger.info("Start env monitor service.") self.dhcp_handler.conf_routes() - self.hostname = socket.gethostname() + self.hostname = self.osutil.get_hostname_record() self.dhcpid = self.osutil.get_dhcp_pid() - self.server_thread = threading.Thread(target = self.monitor) + self.server_thread = threading.Thread(target=self.monitor) self.server_thread.setDaemon(True) self.server_thread.start() @@ -80,8 +80,9 @@ class EnvHandler(object): def handle_hostname_update(self): curr_hostname = socket.gethostname() if curr_hostname != self.hostname: - logger.info("EnvMonitor: Detected host name change: {0} -> {1}", - self.hostname, curr_hostname) + logger.info("EnvMonitor: Detected hostname change: {0} -> {1}", + self.hostname, + curr_hostname) self.osutil.set_hostname(curr_hostname) self.osutil.publish_hostname(curr_hostname) self.hostname = curr_hostname -- cgit v1.2.3