summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_apt_configure.py
diff options
context:
space:
mode:
authorVlastimil Holer <vlastimil.holer@gmail.com>2013-02-21 16:29:06 +0100
committerVlastimil Holer <vlastimil.holer@gmail.com>2013-02-21 16:29:06 +0100
commit10ea1c0bb933b21d32012d89b218a3bbbd15a75a (patch)
tree1d71479c6caf3ce4fbd275f9e8a93c69f7cb7dde /cloudinit/config/cc_apt_configure.py
parent3f61f2ee54ca1e550c733bb5d9b27f6250c1e51e (diff)
downloadvyos-cloud-init-10ea1c0bb933b21d32012d89b218a3bbbd15a75a.tar.gz
vyos-cloud-init-10ea1c0bb933b21d32012d89b218a3bbbd15a75a.zip
Split Debian and Ubuntu APT sources
Diffstat (limited to 'cloudinit/config/cc_apt_configure.py')
-rw-r--r--cloudinit/config/cc_apt_configure.py9
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: