~ubuntu-branches/ubuntu/saucy/cloud-init/saucy-proposed

« back to all changes in this revision

Viewing changes to cloudinit/distros/debian.py

  • Committer: Package Import Robot
  • Author(s): Scott Moser
  • Date: 2013-08-14 21:44:22 UTC
  • mfrom: (1.4.1)
  • Revision ID: package-import@ubuntu.com-20130814214422-uzrq82t5srz2g4c2
Tags: 0.7.3~bzr858-0ubuntu1
* New upstream snapshot.
  * fix resizing of root partition by preferring the functional 'growpart'
    support over the broken 'parted resizepart' support (LP: #1212444)
  * add options for apt_ftp_proxy, apt_https_proxy and apt_config
    (LP: #1057195)

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
    network_conf_fn = "/etc/network/interfaces"
45
45
    tz_conf_fn = "/etc/timezone"
46
46
    tz_local_fn = "/etc/localtime"
47
 
    tz_zone_dir = "/usr/share/zoneinfo"
48
47
 
49
48
    def __init__(self, name, cfg, paths):
50
49
        distros.Distro.__init__(self, name, cfg, paths)
130
129
        return "127.0.1.1"
131
130
 
132
131
    def set_timezone(self, tz):
133
 
        # TODO(harlowja): move this code into
134
 
        # the parent distro...
135
 
        tz_file = os.path.join(self.tz_zone_dir, str(tz))
136
 
        if not os.path.isfile(tz_file):
137
 
            raise RuntimeError(("Invalid timezone %s,"
138
 
                                " no file found at %s") % (tz, tz_file))
 
132
        tz_file = self._find_tz_file(tz)
139
133
        # Note: "" provides trailing newline during join
140
134
        tz_lines = [
141
135
            util.make_header(),