diff options
| author | Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2017-03-15 10:19:34 +0100 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2017-03-17 13:08:24 +0000 |
| commit | c6339c307f36f77a4198d6faf1275acdf371200b (patch) | |
| tree | c774046e1e30617514c09e5a2b896568706a25a8 /azurelinuxagent/ga/env.py | |
| parent | dd73af563850762aad64e7ed2a9897377830af10 (diff) | |
| parent | 2bc77af05fe602a2ba92569428c6006d1aebd19f (diff) | |
| download | vyos-walinuxagent-c6339c307f36f77a4198d6faf1275acdf371200b.tar.gz vyos-walinuxagent-c6339c307f36f77a4198d6faf1275acdf371200b.zip | |
Import patches-applied version 2.2.6-0ubuntu1 to applied/ubuntu/zesty-proposed
Imported using git-ubuntu import.
Changelog parent: dd73af563850762aad64e7ed2a9897377830af10
Unapplied parent: 2bc77af05fe602a2ba92569428c6006d1aebd19f
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).
Diffstat (limited to 'azurelinuxagent/ga/env.py')
| -rw-r--r-- | azurelinuxagent/ga/env.py | 9 |
1 files changed, 5 insertions, 4 deletions
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 |