diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-10 14:35:23 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-10 14:35:23 -0400 |
| commit | b76f489dc594c352b285b0239b0ce872ccf3511d (patch) | |
| tree | 5638753015b8675e53af4b6cabb3cf0d36025bc7 /cloudinit/distros/__init__.py | |
| parent | dae027b74b2b73e34e197f014e3f5220a95a7099 (diff) | |
| parent | 91a5bf5fb67a147e2f434407d1449e745dc1ba3f (diff) | |
| download | vyos-cloud-init-b76f489dc594c352b285b0239b0ce872ccf3511d.tar.gz vyos-cloud-init-b76f489dc594c352b285b0239b0ce872ccf3511d.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/distros/__init__.py')
| -rw-r--r-- | cloudinit/distros/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 9c9211fe..2599d9f2 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -861,5 +861,5 @@ def set_etc_timezone(tz, tz_file=None, tz_conf="/etc/timezone", util.write_file(tz_conf, str(tz).rstrip() + "\n") # This ensures that the correct tz will be used for the system if tz_local and tz_file: - util.copy(tz_file, self.tz_local_fn) + util.copy(tz_file, tz_local) return |