From fec85a42a6502fe986fdd2512963e6cd4fb842a4 Mon Sep 17 00:00:00 2001 From: Shinichi TAMURA Date: Wed, 31 Jan 2018 08:34:45 +0900 Subject: [PATCH] timezone module: Enhanced update command for Debian/Ubuntu (#34390) * timezone module: Symlink to /etc/localtime before dpkg-reconfigure in Debian/Ubuntu * timezone module: Symlink rather than hard link --- lib/ansible/modules/system/timezone.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/system/timezone.py b/lib/ansible/modules/system/timezone.py index 283a7c98f3f..315bc516814 100644 --- a/lib/ansible/modules/system/timezone.py +++ b/lib/ansible/modules/system/timezone.py @@ -336,9 +336,8 @@ class NosystemdTimezone(Timezone): # Distribution-specific configurations if self.module.get_bin_path('dpkg-reconfigure') is not None: # Debian/Ubuntu - # With additional hack for https://bugs.launchpad.net/ubuntu/+source/tzdata/+bug/1554806 - self.update_timezone = ['rm -f /etc/localtime', '%s --frontend noninteractive tzdata' % - self.module.get_bin_path('dpkg-reconfigure', required=True)] + self.update_timezone = ['%s -sf %s /etc/localtime' % (self.module.get_bin_path('ln', required=True), tzfile), + '%s --frontend noninteractive tzdata' % self.module.get_bin_path('dpkg-reconfigure', required=True)] self.conf_files['name'] = '/etc/timezone' self.allow_no_file['name'] = True self.conf_files['hwclock'] = '/etc/default/rcS'