diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-07 16:27:47 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-07 16:27:47 -0500 |
| commit | 3199df6e1489da03d51ac8a2a4574c27fd325189 (patch) | |
| tree | 921700212c063d1b468a8ea2cac4f7df0f3a68d9 /cloudinit/config/cc_apt_configure.py | |
| parent | 21aec9e44c27b9bf1c96314f0449fd39793d1c73 (diff) | |
| parent | 8013c284e82349246b2274f5475c138323fd7c55 (diff) | |
| download | vyos-cloud-init-3199df6e1489da03d51ac8a2a4574c27fd325189.tar.gz vyos-cloud-init-3199df6e1489da03d51ac8a2a4574c27fd325189.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/config/cc_apt_configure.py')
| -rw-r--r-- | cloudinit/config/cc_apt_configure.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py index f8664160..3ce3b351 100644 --- a/cloudinit/config/cc_apt_configure.py +++ b/cloudinit/config/cc_apt_configure.py @@ -140,10 +140,13 @@ def get_release(): def generate_sources_list(codename, mirrors, cloud, log): - template_fn = cloud.get_template_filename('sources.list') + template_fn = cloud.get_template_filename('sources.list.%s' % + (cloud.distro.name)) if not template_fn: - log.warn("No template found, not rendering /etc/apt/sources.list") - return + template_fn = cloud.get_template_filename('sources.list') + if not template_fn: + log.warn("No template found, not rendering /etc/apt/sources.list") + return params = {'codename': codename} for k in mirrors: |