diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-10-10 16:51:18 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-10-10 16:51:18 -0700 |
| commit | b2901994e4310c255a6edf64dcf35c7bf12295ef (patch) | |
| tree | e0ed6c12617fe98ad0bb2d4e19688c5ef16b4e2c /cloudinit/distros | |
| parent | 80eb53deb9f80694c5fd0e0190197de1ff496716 (diff) | |
| download | vyos-cloud-init-b2901994e4310c255a6edf64dcf35c7bf12295ef.tar.gz vyos-cloud-init-b2901994e4310c255a6edf64dcf35c7bf12295ef.zip | |
Add comments as to a future refactoring
of this function that needs to occur since
its pretty much the same now.
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/debian.py | 5 | ||||
| -rw-r--r-- | cloudinit/distros/rhel.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index 20962937..c8b13f95 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -111,7 +111,9 @@ class Distro(distros.Distro): return "127.0.1.1" def set_timezone(self, tz): - tz_file = os.path.join(self.tz_zone_dir, tz) + # TODO(harlowja): move this code into + # the parent distro... + tz_file = os.path.join(self.tz_zone_dir, str(tz)) if not os.path.isfile(tz_file): raise RuntimeError(("Invalid timezone %s," " no file found at %s") % (tz, tz_file)) @@ -122,6 +124,7 @@ class Distro(distros.Distro): "", ] 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) def package_command(self, command, args=None): diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index 21f2216e..45c85fbb 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -186,8 +186,8 @@ class Distro(distros.Distro): return distros.Distro._bring_up_interfaces(self, device_names) def set_timezone(self, tz): - # Ensure that this timezone is actually - # available on this system, if not give up + # TODO(harlowja): move this code into + # the parent distro... tz_file = os.path.join(self.tz_zone_dir, str(tz)) if not os.path.isfile(tz_file): raise RuntimeError(("Invalid timezone %s," |