x/cloud-init
Code Issues Proposed changes

Split Debian and Ubuntu APT sources

Browse Source
This commit is contained in:
Vlastimil Holer 2013-02-21 16:29:06 +01:00
parent 7f7725a340
commit b7d13b8722
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cloudinit/config/cc_apt_configure.py
View File

@ -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:

28
templates/sources.list.debian.tmpl Normal file
View File

@ -0,0 +1,28 @@
\## Note, this file is written by cloud-init on first boot of an instance
\## modifications made here will not survive a re-bundle.
\## if you wish to make changes you can:
\## a.) add 'apt_preserve_sources_list: true' to /etc/cloud/cloud.cfg
\## or do the same in user-data
\## b.) add sources in /etc/apt/sources.list.d
\## c.) make changes to template file /etc/cloud/templates/sources.list.debian.tmpl
\###
# See http://www.debian.org/releases/stable/i386/release-notes/ch-upgrading.html
# for how to upgrade to newer versions of the distribution.
deb $mirror $codename main contrib non-free
deb-src $mirror $codename main contrib non-free
\## Major bug fix updates produced after the final release of the
\## distribution.
deb $security $codename/updates main contrib non-free
deb-src $security $codename/updates main contrib non-free
deb $mirror $codename-updates main contrib non-free
deb-src $mirror $codename-updates main contrib non-free
\## Uncomment the following two lines to add software from the 'backports'
\## repository.
\## N.B. software from this repository may not have been tested as
\## extensively as that contained in the main release, although it includes
\## newer versions of some applications which may provide useful features.
# deb http://backports.debian.org/debian-backports $codename-backports main contrib non-free
# deb-src http://backports.debian.org/debian-backports $codename-backports main contrib non-free

0
templates/sources.list.tmpl → templates/sources.list.ubuntu.tmpl
View File