summaryrefslogtreecommitdiff
path: root/cloudinit/distros/gentoo.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-07-29 09:52:02 -0400
committerScott Moser <smoser@ubuntu.com>2014-07-29 09:52:02 -0400
commit67428ad5a66ee57d1212e5af74cb9e9ed81d2c7b (patch)
treee3ece15c3b28e3cc0ce26b8fe81d72fda1cf7ca8 /cloudinit/distros/gentoo.py
parent4b8397a510c4ff6f903e98bef50d350410f41451 (diff)
downloadvyos-cloud-init-67428ad5a66ee57d1212e5af74cb9e9ed81d2c7b.tar.gz
vyos-cloud-init-67428ad5a66ee57d1212e5af74cb9e9ed81d2c7b.zip
do not put comments in /etc/timezone
comments in /etc/timezone are not expected, and can cause problems if another tool tries to read it. LP: #1341710
Diffstat (limited to 'cloudinit/distros/gentoo.py')
-rw-r--r--cloudinit/distros/gentoo.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
index 09f8d8ea..c4b02de1 100644
--- a/cloudinit/distros/gentoo.py
+++ b/cloudinit/distros/gentoo.py
@@ -31,8 +31,6 @@ LOG = logging.getLogger(__name__)
class Distro(distros.Distro):
locale_conf_fn = "/etc/locale.gen"
network_conf_fn = "/etc/conf.d/net"
- tz_conf_fn = "/etc/timezone"
- tz_local_fn = "/etc/localtime"
init_cmd = [''] # init scripts
def __init__(self, name, cfg, paths):
@@ -140,16 +138,7 @@ class Distro(distros.Distro):
return hostname
def set_timezone(self, tz):
- tz_file = self._find_tz_file(tz)
- # Note: "" provides trailing newline during join
- tz_lines = [
- util.make_header(),
- str(tz),
- "",
- ]
- util.write_file(self.tz_conf_fn, "\n".join(tz_lines))
- # This ensures that the correct tz will be used for the system
- util.copy(tz_file, self.tz_local_fn)
+ set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
def package_command(self, command, args=None, pkgs=None):
if pkgs is None: