diff options
| author | Vlastimil Holer <vlastimil.holer@gmail.com> | 2013-02-21 11:57:25 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-02-21 11:57:25 -0500 |
| commit | d4886b65549c886499141872a9928412a74bbea2 (patch) | |
| tree | 200a0bc7217b5f8415205acd1c063e143978e34f /cloudinit | |
| parent | 174bc39e6b2c1cac3f73f67f25fad87cab16fa42 (diff) | |
| parent | 10ea1c0bb933b21d32012d89b218a3bbbd15a75a (diff) | |
| download | vyos-cloud-init-d4886b65549c886499141872a9928412a74bbea2.tar.gz vyos-cloud-init-d4886b65549c886499141872a9928412a74bbea2.zip | |
Few patches to make life on Debian 6 stable happier:
* Added arguments to packages/bddeb:
-d pass through '-d' to debuild
--no-cloud-utils don't depend on cloud-utils package (default: False)
These are essential for building on Debian 6, because there are
no python-mocker (build dependency) and cloud-utils (install dependency)
in squeeze and squeeze-backports.
* SysVinit startup scripts modified to run both on RHEL and Debian,
* (Unfortunately) New option INIT_SYSTEM=sysvinit_deb for Debian /etc/init.d/
directory
* Make separate Ubuntu and Debian APT source template (cc_apt_configure)
I'm now generating working Debian 6 package following way:
INIT_SYSTEM=sysvinit_deb packages/bddeb -us -uc --no-cloud-utils -d
Diffstat (limited to 'cloudinit')
| -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: |