Merge lp:~darkmuggle-deactivatedaccount/cloud-init/lp1177432 into lp:~cloud-init-dev/cloud-init/trunk

[Ben Howard]

Enable backports for cloud-images.

[lp:~darkmuggle-deactivatedaccount/cloud-init/lp1177432]

1152. By Ben Howard on 2015-11-02

Fixed per MP review

[Scott Moser (smoser)]

My feelings have not really changed since I wrote them 2 years ago in comment 3 of bug 1177432.
This change would make the image usage *worse* for some set of cloud image users. Without numbers to back that up, I really suspect that the users who do not use backports on server (or cloud) instances dramatically out-numbers those who do.

[Stéphane Graber (stgraber)]

Diff looks good to me.

=== modified file 'templates/sources.list.ubuntu.tmpl'
--- templates/sources.list.ubuntu.tmpl	2014-03-05 23:05:59 +0000
+++ templates/sources.list.ubuntu.tmpl	2015-11-02 15:41:18 +0000
@@ -35,15 +35,22 @@
 # deb {{mirror}} {{codename}}-updates multiverse
 # deb-src {{mirror}} {{codename}}-updates multiverse
 
-## 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.
 ## Also, please note that software in backports WILL NOT receive any review
 ## or updates from the Ubuntu security team.
-# deb {{mirror}} {{codename}}-backports main restricted universe multiverse
-# deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse
+deb {{mirror}} {{codename}}-backports main
+deb-src {{mirror}} {{codename}}-backports main
+deb {{mirror}} {{codename}}-backports universe
+deb-src {{mirror}} {{codename}}-backports universe
+
+## Uncomment the following two to add software from the 'backports'
+## multiverse and restricted repositories.
+# deb {{mirror}} {{codename}}-backports multiverse
+# deb-src {{mirror}} {{codename}}-backports multiverse
+# deb {{mirror}} {{codename}}-backports restricted
+# deb-src {{mirror}} {{codename}}-backports restricted
 
 ## Uncomment the following two lines to add software from Canonical's
 ## 'partner' repository.